You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2020/11/28 01:32:36 UTC

[camel-kafka-connector] branch camel-master updated (bd78396 -> 3198001)

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

github-bot pushed a change to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.


 discard bd78396  [create-pull-request] automated change
 discard 1b596a4  Fixed catalog test with JDK11
 discard 7a0cba2  Regen
 discard 35d96ae  Fixed Test and regen
 discard 42ae769  Regen and fixed compilation
 discard 771772b  Fixed CamelKafkaConnectorCatalogTest
 discard 6197ea6  Camel-kafka-connector-catalog: Avoid to check for number of options on camel-master
 discard f52913f  Updated AWS test services according to interface changes from camel 3.7
 discard a3258fb  Regen
 discard ff76315  File language and core languages in general are not working
 discard 4546e0f  Camel-Master: Fix catalog test
 discard 3ad7252  Fix couchbase catalog test
 discard f19d1c7  Fixed incorrect formatting of Bucket URL in Couchbase tests
 discard a6905a0  Aligned camel-master tests with fix
 discard c448149  Adjust the emdedded Kafka service to the updated interface from Camel 3.7
 discard 5f26c39  Catalog tests fixed
 discard f9b99d0  Camel-Master: Fixed catalog test for aws2-sns
 discard 985225f  [create-pull-request] automated change
 discard bde443f  [create-pull-request] automated change
 discard b9bb995  Temporarily disable a test affected by CAMEL-15789
 discard 774d7ea  Point to 3.7.0-SNAPSHOT
     add e85b561  Updated CHANGELOG.md
     new d4a5131  Point to 3.7.0-SNAPSHOT
     new 700047d  Temporarily disable a test affected by CAMEL-15789
     new 72b7670  [create-pull-request] automated change
     new 5c5be96  [create-pull-request] automated change
     new 377525b  Camel-Master: Fixed catalog test for aws2-sns
     new 8271de5  Catalog tests fixed
     new fc53d5a  Adjust the emdedded Kafka service to the updated interface from Camel 3.7
     new 620bb58  Aligned camel-master tests with fix
     new 48707ef  Fixed incorrect formatting of Bucket URL in Couchbase tests
     new 610da53  Fix couchbase catalog test
     new cf42b29  Camel-Master: Fix catalog test
     new 2ac661c  File language and core languages in general are not working
     new 7cbd010  Regen
     new bff8ad6  Updated AWS test services according to interface changes from camel 3.7
     new 3810a62  Camel-kafka-connector-catalog: Avoid to check for number of options on camel-master
     new 67302bd  Fixed CamelKafkaConnectorCatalogTest
     new 099f56e  Regen and fixed compilation
     new 669d726  Fixed Test and regen
     new 41ed0d6  Regen
     new fcb85ca  Fixed catalog test with JDK11
     new 3198001  [create-pull-request] automated change

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   (bd78396)
            \
             N -- N -- N   refs/heads/camel-master (3198001)

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 21 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:
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)


[camel-kafka-connector] 05/21: Camel-Master: Fixed catalog test for aws2-sns

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 377525bd2394c40a30052d664c2a1e160c6ec2ab
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 12 06:53:01 2020 +0100

    Camel-Master: Fixed catalog test for aws2-sns
---
 .../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 50157ac..49a1295 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -74,7 +74,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector", model.getGroupId());
         assertEquals("sink", model.getType());
         assertEquals("org.apache.camel.kafkaconnector.aws2sns.CamelAws2snsSinkConnector", model.getConnectorClass());
-        assertEquals(42, model.getOptions().size());
+        assertEquals(44, model.getOptions().size());
         assertEquals("camel.sink.path.topicNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonSNSClient", model.getOptions().get(1).getName());
         assertEquals("camel.sink.endpoint.autoCreateTopic", model.getOptions().get(2).getName());


[camel-kafka-connector] 19/21: Regen

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 41ed0d6e38e93830f9170eb2b34aac990ad5449d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 24 07:47:10 2020 +0100

    Regen
---
 .../resources/connectors/camel-activemq-sink.json  |  17 +--
 .../connectors/camel-activemq-source.json          |  17 +--
 .../resources/connectors/camel-ahc-sink.json       |  17 +--
 .../resources/connectors/camel-ahc-ws-sink.json    |  17 +--
 .../resources/connectors/camel-ahc-ws-source.json  |  17 +--
 .../resources/connectors/camel-ahc-wss-sink.json   |  17 +--
 .../resources/connectors/camel-ahc-wss-source.json |  17 +--
 .../resources/connectors/camel-amqp-sink.json      |  17 +--
 .../resources/connectors/camel-amqp-source.json    |  17 +--
 .../resources/connectors/camel-apns-sink.json      |  17 +--
 .../resources/connectors/camel-apns-source.json    |  17 +--
 .../resources/connectors/camel-arangodb-sink.json  |  17 +--
 .../resources/connectors/camel-as2-sink.json       |  17 +--
 .../resources/connectors/camel-as2-source.json     |  17 +--
 .../resources/connectors/camel-asterisk-sink.json  |  17 +--
 .../connectors/camel-asterisk-source.json          |  17 +--
 .../resources/connectors/camel-atlasmap-sink.json  |  19 +---
 .../resources/connectors/camel-atmos-sink.json     |  17 +--
 .../resources/connectors/camel-atmos-source.json   |  17 +--
 .../camel-atmosphere-websocket-sink.json           |  17 +--
 .../camel-atmosphere-websocket-source.json         |  17 +--
 .../resources/connectors/camel-atom-source.json    |  17 +--
 .../connectors/camel-atomix-map-sink.json          |  17 +--
 .../connectors/camel-atomix-map-source.json        |  17 +--
 .../connectors/camel-atomix-messaging-sink.json    |  17 +--
 .../connectors/camel-atomix-messaging-source.json  |  17 +--
 .../connectors/camel-atomix-multimap-sink.json     |  17 +--
 .../connectors/camel-atomix-queue-sink.json        |  17 +--
 .../connectors/camel-atomix-queue-source.json      |  17 +--
 .../connectors/camel-atomix-set-sink.json          |  17 +--
 .../connectors/camel-atomix-set-source.json        |  17 +--
 .../connectors/camel-atomix-value-sink.json        |  17 +--
 .../connectors/camel-atomix-value-source.json      |  17 +--
 .../resources/connectors/camel-avro-sink.json      |  17 +--
 .../resources/connectors/camel-avro-source.json    |  17 +--
 .../resources/connectors/camel-aws-cw-sink.json    |  17 +--
 .../resources/connectors/camel-aws-ddb-sink.json   |  17 +--
 .../connectors/camel-aws-ddbstream-source.json     |  17 +--
 .../resources/connectors/camel-aws-ec2-sink.json   |  17 +--
 .../resources/connectors/camel-aws-ecs-sink.json   |  17 +--
 .../resources/connectors/camel-aws-eks-sink.json   |  17 +--
 .../resources/connectors/camel-aws-iam-sink.json   |  17 +--
 .../camel-aws-kinesis-firehose-sink.json           |  17 +--
 .../connectors/camel-aws-kinesis-sink.json         |  17 +--
 .../connectors/camel-aws-kinesis-source.json       |  17 +--
 .../resources/connectors/camel-aws-kms-sink.json   |  17 +--
 .../connectors/camel-aws-lambda-sink.json          |  21 ++--
 .../resources/connectors/camel-aws-mq-sink.json    |  17 +--
 .../resources/connectors/camel-aws-msk-sink.json   |  17 +--
 .../resources/connectors/camel-aws-s3-sink.json    |  17 +--
 .../resources/connectors/camel-aws-s3-source.json  |  17 +--
 .../resources/connectors/camel-aws-sdb-sink.json   |  17 +--
 .../resources/connectors/camel-aws-ses-sink.json   |  17 +--
 .../resources/connectors/camel-aws-sns-sink.json   |  17 +--
 .../resources/connectors/camel-aws-sqs-sink.json   |  17 +--
 .../resources/connectors/camel-aws-sqs-source.json |  17 +--
 .../resources/connectors/camel-aws-swf-sink.json   |  17 +--
 .../resources/connectors/camel-aws-swf-source.json |  17 +--
 .../connectors/camel-aws-translate-sink.json       |  17 +--
 .../connectors/camel-aws2-athena-sink.json         |  31 +----
 .../resources/connectors/camel-aws2-cw-sink.json   |  31 +----
 .../resources/connectors/camel-aws2-ddb-sink.json  |  31 +----
 .../connectors/camel-aws2-ddbstream-source.json    |  31 +----
 .../resources/connectors/camel-aws2-ec2-sink.json  |  31 +----
 .../resources/connectors/camel-aws2-ecs-sink.json  |  31 +----
 .../resources/connectors/camel-aws2-eks-sink.json  |  31 +----
 .../connectors/camel-aws2-eventbridge-sink.json    |  31 +----
 .../resources/connectors/camel-aws2-iam-sink.json  |  31 +----
 .../camel-aws2-kinesis-firehose-sink.json          |  31 +----
 .../connectors/camel-aws2-kinesis-sink.json        |  31 +----
 .../connectors/camel-aws2-kinesis-source.json      |  31 +----
 .../resources/connectors/camel-aws2-kms-sink.json  |  31 +----
 .../connectors/camel-aws2-lambda-sink.json         |  35 ++----
 .../resources/connectors/camel-aws2-mq-sink.json   |  31 +----
 .../resources/connectors/camel-aws2-msk-sink.json  |  31 +----
 .../resources/connectors/camel-aws2-s3-sink.json   |  24 +++-
 .../resources/connectors/camel-aws2-s3-source.json |  24 +++-
 .../resources/connectors/camel-aws2-ses-sink.json  |  31 +----
 .../resources/connectors/camel-aws2-sns-sink.json  |  35 +++---
 .../resources/connectors/camel-aws2-sqs-sink.json  |  39 ++-----
 .../connectors/camel-aws2-sqs-source.json          |  39 ++-----
 .../resources/connectors/camel-aws2-sts-sink.json  |  31 +----
 .../connectors/camel-aws2-translate-sink.json      |  31 +----
 .../connectors/camel-azure-blob-sink.json          |  17 +--
 .../connectors/camel-azure-blob-source.json        |  17 +--
 .../connectors/camel-azure-eventhubs-sink.json     |  17 +--
 .../connectors/camel-azure-eventhubs-source.json   |  17 +--
 .../connectors/camel-azure-queue-sink.json         |  17 +--
 .../connectors/camel-azure-queue-source.json       |  17 +--
 .../connectors/camel-azure-storage-blob-sink.json  |  17 +--
 .../camel-azure-storage-blob-source.json           |  17 +--
 .../connectors/camel-azure-storage-queue-sink.json |  17 +--
 .../camel-azure-storage-queue-source.json          |  17 +--
 .../resources/connectors/camel-bean-sink.json      |  17 +--
 .../resources/connectors/camel-beanstalk-sink.json |  17 +--
 .../connectors/camel-beanstalk-source.json         |  17 +--
 .../resources/connectors/camel-box-sink.json       |  17 +--
 .../resources/connectors/camel-box-source.json     |  17 +--
 .../resources/connectors/camel-braintree-sink.json |  17 +--
 .../connectors/camel-caffeine-cache-sink.json      |  17 +--
 .../connectors/camel-caffeine-loadcache-sink.json  |  17 +--
 .../connectors/camel-chatscript-sink.json          |  17 +--
 .../resources/connectors/camel-chunk-sink.json     |  17 +--
 .../resources/connectors/camel-cm-sms-sink.json    |  17 +--
 .../resources/connectors/camel-cmis-sink.json      |  17 +--
 .../resources/connectors/camel-cmis-source.json    |  17 +--
 .../resources/connectors/camel-coap+tcp-sink.json  |  17 +--
 .../connectors/camel-coap+tcp-source.json          |  17 +--
 .../resources/connectors/camel-coap-sink.json      |  17 +--
 .../resources/connectors/camel-coap-source.json    |  17 +--
 .../resources/connectors/camel-coaps+tcp-sink.json |  17 +--
 .../connectors/camel-coaps+tcp-source.json         |  17 +--
 .../resources/connectors/camel-coaps-sink.json     |  17 +--
 .../resources/connectors/camel-coaps-source.json   |  17 +--
 .../resources/connectors/camel-cometd-sink.json    |  17 +--
 .../resources/connectors/camel-cometd-source.json  |  17 +--
 .../resources/connectors/camel-cometds-sink.json   |  17 +--
 .../resources/connectors/camel-cometds-source.json |  17 +--
 .../resources/connectors/camel-consul-sink.json    |  17 +--
 .../resources/connectors/camel-consul-source.json  |  17 +--
 .../connectors/camel-controlbus-sink.json          |  17 +--
 .../resources/connectors/camel-corda-sink.json     |  17 +--
 .../resources/connectors/camel-corda-source.json   |  17 +--
 .../resources/connectors/camel-couchbase-sink.json |  18 +--
 .../connectors/camel-couchbase-source.json         |  25 +++--
 .../resources/connectors/camel-couchdb-sink.json   |  17 +--
 .../resources/connectors/camel-couchdb-source.json |  17 +--
 .../resources/connectors/camel-cql-sink.json       |  17 +--
 .../resources/connectors/camel-cql-source.json     |  17 +--
 .../resources/connectors/camel-cron-source.json    |  17 +--
 .../connectors/camel-crypto-cms-sink.json          |  17 +--
 .../resources/connectors/camel-crypto-sink.json    |  17 +--
 .../resources/connectors/camel-cxf-sink.json       |  17 +--
 .../resources/connectors/camel-cxf-source.json     |  17 +--
 .../resources/connectors/camel-cxfrs-sink.json     |  17 +--
 .../resources/connectors/camel-cxfrs-source.json   |  17 +--
 .../connectors/camel-dataformat-sink.json          |  17 +--
 .../resources/connectors/camel-direct-sink.json    |  17 +--
 .../resources/connectors/camel-direct-source.json  |  17 +--
 .../resources/connectors/camel-direct-vm-sink.json |  17 +--
 .../connectors/camel-direct-vm-source.json         |  17 +--
 .../resources/connectors/camel-disruptor-sink.json |  17 +--
 .../connectors/camel-disruptor-source.json         |  17 +--
 .../connectors/camel-disruptor-vm-sink.json        |  17 +--
 .../connectors/camel-disruptor-vm-source.json      |  17 +--
 .../resources/connectors/camel-djl-sink.json       |  17 +--
 .../resources/connectors/camel-dns-sink.json       |  17 +--
 .../resources/connectors/camel-docker-sink.json    |  17 +--
 .../resources/connectors/camel-docker-source.json  |  17 +--
 .../resources/connectors/camel-dozer-sink.json     |  17 +--
 .../resources/connectors/camel-drill-sink.json     |  17 +--
 .../resources/connectors/camel-dropbox-sink.json   |  17 +--
 .../resources/connectors/camel-dropbox-source.json |  17 +--
 .../resources/connectors/camel-ehcache-sink.json   |  17 +--
 .../resources/connectors/camel-ehcache-source.json |  17 +--
 .../connectors/camel-elasticsearch-rest-sink.json  |  17 +--
 .../resources/connectors/camel-elsql-sink.json     |  17 +--
 .../resources/connectors/camel-elsql-source.json   |  17 +--
 .../resources/connectors/camel-etcd-keys-sink.json |  17 +--
 .../connectors/camel-etcd-stats-sink.json          |  17 +--
 .../connectors/camel-etcd-stats-source.json        |  17 +--
 .../connectors/camel-etcd-watch-source.json        |  17 +--
 .../resources/connectors/camel-exec-sink.json      |  17 +--
 .../resources/connectors/camel-facebook-sink.json  |  17 +--
 .../connectors/camel-facebook-source.json          |  17 +--
 .../resources/connectors/camel-fhir-sink.json      |  17 +--
 .../resources/connectors/camel-fhir-source.json    |  17 +--
 .../resources/connectors/camel-file-sink.json      |  17 +--
 .../resources/connectors/camel-file-source.json    |  17 +--
 .../connectors/camel-file-watch-source.json        |  17 +--
 .../resources/connectors/camel-flatpack-sink.json  |  17 +--
 .../connectors/camel-flatpack-source.json          |  17 +--
 .../resources/connectors/camel-flink-sink.json     |  17 +--
 .../resources/connectors/camel-fop-sink.json       |  17 +--
 .../connectors/camel-freemarker-sink.json          |  17 +--
 .../resources/connectors/camel-ftp-sink.json       |  17 +--
 .../resources/connectors/camel-ftp-source.json     |  17 +--
 .../resources/connectors/camel-ftps-sink.json      |  17 +--
 .../resources/connectors/camel-ftps-source.json    |  17 +--
 .../resources/connectors/camel-ganglia-sink.json   |  17 +--
 .../resources/connectors/camel-geocoder-sink.json  |  17 +--
 .../resources/connectors/camel-git-sink.json       |  17 +--
 .../resources/connectors/camel-git-source.json     |  17 +--
 .../resources/connectors/camel-github-sink.json    |  19 +---
 .../resources/connectors/camel-github-source.json  | 125 +++++++++++++++++++--
 .../connectors/camel-google-bigquery-sink.json     |  21 ++--
 .../connectors/camel-google-bigquery-sql-sink.json |  21 ++--
 .../connectors/camel-google-calendar-sink.json     |  17 +--
 .../connectors/camel-google-calendar-source.json   |  17 +--
 .../camel-google-calendar-stream-source.json       |  17 +--
 .../connectors/camel-google-drive-sink.json        |  17 +--
 .../connectors/camel-google-drive-source.json      |  17 +--
 .../connectors/camel-google-mail-sink.json         |  17 +--
 .../connectors/camel-google-mail-source.json       |  17 +--
 .../camel-google-mail-stream-source.json           |  17 +--
 .../connectors/camel-google-pubsub-sink.json       |  17 ++-
 .../connectors/camel-google-pubsub-source.json     |  17 +--
 .../connectors/camel-google-sheets-sink.json       |  17 +--
 .../connectors/camel-google-sheets-source.json     |  17 +--
 .../camel-google-sheets-stream-source.json         |  17 +--
 .../resources/connectors/camel-gora-sink.json      |  17 +--
 .../resources/connectors/camel-gora-source.json    |  17 +--
 .../resources/connectors/camel-grape-sink.json     |  17 +--
 .../resources/connectors/camel-graphql-sink.json   |  24 ++--
 .../resources/connectors/camel-grpc-sink.json      |  17 +--
 .../resources/connectors/camel-grpc-source.json    |  17 +--
 .../connectors/camel-guava-eventbus-sink.json      |  17 +--
 .../connectors/camel-guava-eventbus-source.json    |  17 +--
 .../camel-hazelcast-atomicvalue-sink.json          |  17 +--
 .../camel-hazelcast-instance-source.json           |  17 +--
 .../connectors/camel-hazelcast-list-sink.json      |  17 +--
 .../connectors/camel-hazelcast-list-source.json    |  17 +--
 .../connectors/camel-hazelcast-map-sink.json       |  17 +--
 .../connectors/camel-hazelcast-map-source.json     |  17 +--
 .../connectors/camel-hazelcast-multimap-sink.json  |  17 +--
 .../camel-hazelcast-multimap-source.json           |  17 +--
 .../connectors/camel-hazelcast-queue-sink.json     |  17 +--
 .../connectors/camel-hazelcast-queue-source.json   |  17 +--
 .../camel-hazelcast-replicatedmap-sink.json        |  17 +--
 .../camel-hazelcast-replicatedmap-source.json      |  17 +--
 .../camel-hazelcast-ringbuffer-sink.json           |  17 +--
 .../connectors/camel-hazelcast-seda-sink.json      |  17 +--
 .../connectors/camel-hazelcast-seda-source.json    |  17 +--
 .../connectors/camel-hazelcast-set-sink.json       |  17 +--
 .../connectors/camel-hazelcast-set-source.json     |  17 +--
 .../connectors/camel-hazelcast-topic-sink.json     |  17 +--
 .../connectors/camel-hazelcast-topic-source.json   |  17 +--
 .../resources/connectors/camel-hbase-sink.json     |  17 +--
 .../resources/connectors/camel-hbase-source.json   |  17 +--
 .../resources/connectors/camel-hdfs-sink.json      |  17 +--
 .../resources/connectors/camel-hdfs-source.json    |  17 +--
 .../resources/connectors/camel-http-sink.json      |  17 +--
 .../resources/connectors/camel-https-sink.json     |  17 +--
 .../connectors/camel-iec60870-client-sink.json     |  17 +--
 .../connectors/camel-iec60870-client-source.json   |  17 +--
 .../connectors/camel-iec60870-server-sink.json     |  17 +--
 .../connectors/camel-iec60870-server-source.json   |  17 +--
 .../connectors/camel-ignite-cache-sink.json        |  17 +--
 .../connectors/camel-ignite-cache-source.json      |  17 +--
 .../connectors/camel-ignite-compute-sink.json      |  17 +--
 .../connectors/camel-ignite-events-source.json     |  17 +--
 .../connectors/camel-ignite-idgen-sink.json        |  17 +--
 .../connectors/camel-ignite-messaging-sink.json    |  17 +--
 .../connectors/camel-ignite-messaging-source.json  |  17 +--
 .../connectors/camel-ignite-queue-sink.json        |  17 +--
 .../connectors/camel-ignite-set-sink.json          |  17 +--
 .../resources/connectors/camel-imap-sink.json      |  17 +--
 .../resources/connectors/camel-imap-source.json    |  17 +--
 .../resources/connectors/camel-imaps-sink.json     |  17 +--
 .../resources/connectors/camel-imaps-source.json   |  17 +--
 .../connectors/camel-infinispan-sink.json          |  17 +--
 .../connectors/camel-infinispan-source.json        |  17 +--
 .../resources/connectors/camel-influxdb-sink.json  |  17 +--
 .../resources/connectors/camel-iota-sink.json      |  17 +--
 .../resources/connectors/camel-ipfs-sink.json      |  17 +--
 .../resources/connectors/camel-irc-sink.json       |  17 +--
 .../resources/connectors/camel-irc-source.json     |  17 +--
 .../resources/connectors/camel-ironmq-sink.json    |  17 +--
 .../resources/connectors/camel-ironmq-source.json  |  17 +--
 .../resources/connectors/camel-jbpm-sink.json      |  17 +--
 .../resources/connectors/camel-jbpm-source.json    |  17 +--
 .../resources/connectors/camel-jcache-sink.json    |  17 +--
 .../resources/connectors/camel-jcache-source.json  |  17 +--
 .../resources/connectors/camel-jclouds-sink.json   |  17 +--
 .../resources/connectors/camel-jclouds-source.json |  17 +--
 .../resources/connectors/camel-jcr-sink.json       |  17 +--
 .../resources/connectors/camel-jcr-source.json     |  17 +--
 .../resources/connectors/camel-jdbc-sink.json      |  17 +--
 .../resources/connectors/camel-jetty-source.json   |  31 ++---
 .../connectors/camel-jgroups-raft-sink.json        |  17 +--
 .../connectors/camel-jgroups-raft-source.json      |  17 +--
 .../resources/connectors/camel-jgroups-sink.json   |  17 +--
 .../resources/connectors/camel-jgroups-source.json |  17 +--
 .../resources/connectors/camel-jing-sink.json      |  17 +--
 .../resources/connectors/camel-jira-sink.json      |  17 +--
 .../resources/connectors/camel-jira-source.json    |  17 +--
 .../resources/connectors/camel-jms-sink.json       |  17 +--
 .../resources/connectors/camel-jms-source.json     |  17 +--
 .../resources/connectors/camel-jmx-source.json     |  17 +--
 .../resources/connectors/camel-jolt-sink.json      |  17 +--
 280 files changed, 1595 insertions(+), 3665 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-sink.json
index 16ae0b7..384a98f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-sink.json
@@ -261,13 +261,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.destinationResolver": {
 			"name": "camel.sink.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -760,11 +753,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.activemq.basicPropertyBinding": {
-			"name": "camel.component.activemq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.activemq.autowiredEnabled": {
+			"name": "camel.component.activemq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.activemq.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-source.json
index 239fd28..b4688db 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-source.json
@@ -247,13 +247,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.destinationResolver": {
 			"name": "camel.source.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -734,11 +727,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.activemq.basicPropertyBinding": {
-			"name": "camel.component.activemq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.activemq.autowiredEnabled": {
+			"name": "camel.component.activemq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.activemq.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-sink.json
index e895fc2..7390159 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-sink.json
@@ -69,13 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -127,11 +120,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc.basicPropertyBinding": {
-			"name": "camel.component.ahc.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc.autowiredEnabled": {
+			"name": "camel.component.ahc.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc.binding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-sink.json
index 34731ca..ef5573c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-sink.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -134,11 +127,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-ws.basicPropertyBinding": {
-			"name": "camel.component.ahc-ws.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-ws.autowiredEnabled": {
+			"name": "camel.component.ahc-ws.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-ws.binding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-source.json
index 3ae9a95..b68bf77 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-source.json
@@ -75,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -133,11 +126,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-ws.basicPropertyBinding": {
-			"name": "camel.component.ahc-ws.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-ws.autowiredEnabled": {
+			"name": "camel.component.ahc-ws.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-ws.binding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-sink.json
index 63cbb60..e4fea62 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-sink.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -134,11 +127,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-wss.basicPropertyBinding": {
-			"name": "camel.component.ahc-wss.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-wss.autowiredEnabled": {
+			"name": "camel.component.ahc-wss.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-wss.binding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-source.json
index 40c1d8a..270adac 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-source.json
@@ -75,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -133,11 +126,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-wss.basicPropertyBinding": {
-			"name": "camel.component.ahc-wss.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-wss.autowiredEnabled": {
+			"name": "camel.component.ahc-wss.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-wss.binding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-sink.json
index d49cf73..a72d743 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-sink.json
@@ -261,13 +261,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.destinationResolver": {
 			"name": "camel.sink.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -747,11 +740,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.amqp.basicPropertyBinding": {
-			"name": "camel.component.amqp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.amqp.autowiredEnabled": {
+			"name": "camel.component.amqp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.amqp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-source.json
index cc16650..c3feb3a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-source.json
@@ -247,13 +247,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.destinationResolver": {
 			"name": "camel.source.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -721,11 +714,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.amqp.basicPropertyBinding": {
-			"name": "camel.component.amqp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.amqp.autowiredEnabled": {
+			"name": "camel.component.amqp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.amqp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-sink.json
index 2ebea02..ec84d66 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -55,11 +48,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.apns.basicPropertyBinding": {
-			"name": "camel.component.apns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.apns.autowiredEnabled": {
+			"name": "camel.component.apns.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-source.json
index 8e59414..d8e7156 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-source.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -173,11 +166,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.apns.basicPropertyBinding": {
-			"name": "camel.component.apns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.apns.autowiredEnabled": {
+			"name": "camel.component.apns.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-arangodb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-arangodb-sink.json
index 08f33d9..8d71970 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-arangodb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-arangodb-sink.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -145,11 +138,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.arangodb.basicPropertyBinding": {
-			"name": "camel.component.arangodb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.arangodb.autowiredEnabled": {
+			"name": "camel.component.arangodb.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.arangodb.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-sink.json
index 52cc0ca..506fbff 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-sink.json
@@ -196,13 +196,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -217,11 +210,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.as2.basicPropertyBinding": {
-			"name": "camel.component.as2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.as2.autowiredEnabled": {
+			"name": "camel.component.as2.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.as2.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-source.json
index 5097d1e..207f25c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-source.json
@@ -201,13 +201,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -222,11 +215,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.as2.basicPropertyBinding": {
-			"name": "camel.component.as2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.as2.autowiredEnabled": {
+			"name": "camel.component.as2.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.as2.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-sink.json
index 5ffe733..e46bf0c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-sink.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -67,11 +60,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.asterisk.basicPropertyBinding": {
-			"name": "camel.component.asterisk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.asterisk.autowiredEnabled": {
+			"name": "camel.component.asterisk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-source.json
index b68ffef..bb38c15 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.asterisk.basicPropertyBinding": {
-			"name": "camel.component.asterisk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.asterisk.autowiredEnabled": {
+			"name": "camel.component.asterisk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atlasmap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atlasmap-sink.json
index 5bf8f40..db58112 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atlasmap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atlasmap-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.propertiesFile": {
 			"name": "camel.sink.endpoint.propertiesFile",
 			"description": "The URI of the properties file which is used for AtlasContextFactory initialization.",
@@ -88,12 +81,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atlasmap.basicPropertyBinding": {
-			"name": "camel.component.atlasmap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atlasmap.autowiredEnabled": {
+			"name": "camel.component.atlasmap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-sink.json
index 76aa2e7..a9ba8c9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-sink.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmos.basicPropertyBinding": {
-			"name": "camel.component.atmos.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmos.autowiredEnabled": {
+			"name": "camel.component.atmos.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmos.uri": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-source.json
index d16116c..ea5638b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-source.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmos.basicPropertyBinding": {
-			"name": "camel.component.atmos.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmos.autowiredEnabled": {
+			"name": "camel.component.atmos.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmos.uri": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-sink.json
index 471c142..cec8c98 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-sink.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.mapHttpMessageBody": {
 			"name": "camel.sink.endpoint.mapHttpMessageBody",
 			"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.",
@@ -125,11 +118,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmosphere-websocket.basicPropertyBinding": {
-			"name": "camel.component.atmosphere-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmosphere-websocket.autowiredEnabled": {
+			"name": "camel.component.atmosphere-websocket.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmosphere-websocket.httpBinding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-source.json
index 6980b7d..52ac73b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-source.json
@@ -155,13 +155,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.mapHttpMessageBody": {
 			"name": "camel.source.endpoint.mapHttpMessageBody",
 			"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.",
@@ -230,11 +223,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmosphere-websocket.basicPropertyBinding": {
-			"name": "camel.component.atmosphere-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmosphere-websocket.autowiredEnabled": {
+			"name": "camel.component.atmosphere-websocket.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmosphere-websocket.httpBinding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atom-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atom-source.json
index b759d6d..a690664 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atom-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atom-source.json
@@ -100,13 +100,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -214,11 +207,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atom.basicPropertyBinding": {
-			"name": "camel.component.atom.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atom.autowiredEnabled": {
+			"name": "camel.component.atom.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-sink.json
index a003fd5..65f5bfb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-sink.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-map.basicPropertyBinding": {
-			"name": "camel.component.atomix-map.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-map.autowiredEnabled": {
+			"name": "camel.component.atomix-map.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-map.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-source.json
index 929a1db..2d54881 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-source.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -198,11 +191,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-map.basicPropertyBinding": {
-			"name": "camel.component.atomix-map.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-map.autowiredEnabled": {
+			"name": "camel.component.atomix-map.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-map.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-sink.json
index 1e252ff..570b8df 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-sink.json
@@ -79,13 +79,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -200,11 +193,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-messaging.basicPropertyBinding": {
-			"name": "camel.component.atomix-messaging.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-messaging.autowiredEnabled": {
+			"name": "camel.component.atomix-messaging.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-messaging.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-source.json
index 8db866d..7f16975 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-source.json
@@ -91,13 +91,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -212,11 +205,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-messaging.basicPropertyBinding": {
-			"name": "camel.component.atomix-messaging.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-messaging.autowiredEnabled": {
+			"name": "camel.component.atomix-messaging.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-messaging.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-multimap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-multimap-sink.json
index 81ffc22..3b6e3b7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-multimap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-multimap-sink.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-multimap.basicPropertyBinding": {
-			"name": "camel.component.atomix-multimap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-multimap.autowiredEnabled": {
+			"name": "camel.component.atomix-multimap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-multimap.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-sink.json
index ad929a3..46bf77f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -162,11 +155,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-queue.basicPropertyBinding": {
-			"name": "camel.component.atomix-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-queue.autowiredEnabled": {
+			"name": "camel.component.atomix-queue.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-queue.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-source.json
index fd1c961..db3757b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-source.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -174,11 +167,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-queue.basicPropertyBinding": {
-			"name": "camel.component.atomix-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-queue.autowiredEnabled": {
+			"name": "camel.component.atomix-queue.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-queue.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-sink.json
index 43c8814..fd759f5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -174,11 +167,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-set.basicPropertyBinding": {
-			"name": "camel.component.atomix-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-set.autowiredEnabled": {
+			"name": "camel.component.atomix-set.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-set.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-source.json
index 2b1c264..52fd093 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-set.basicPropertyBinding": {
-			"name": "camel.component.atomix-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-set.autowiredEnabled": {
+			"name": "camel.component.atomix-set.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-set.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-sink.json
index caa6fec..e661b78 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -174,11 +167,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-value.basicPropertyBinding": {
-			"name": "camel.component.atomix-value.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-value.autowiredEnabled": {
+			"name": "camel.component.atomix-value.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-value.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-source.json
index 6fc8726..4c45c3a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-value.basicPropertyBinding": {
-			"name": "camel.component.atomix-value.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-value.autowiredEnabled": {
+			"name": "camel.component.atomix-value.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-value.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-sink.json
index ec3209f..fc86f1e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,11 +130,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.avro.basicPropertyBinding": {
-			"name": "camel.component.avro.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.avro.autowiredEnabled": {
+			"name": "camel.component.avro.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.avro.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-source.json
index 0d60fc9..4494919 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-source.json
@@ -90,13 +90,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -149,11 +142,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.avro.basicPropertyBinding": {
-			"name": "camel.component.avro.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.avro.autowiredEnabled": {
+			"name": "camel.component.avro.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.avro.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cw-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cw-sink.json
index 793e21f..8c612d1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cw-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cw-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -185,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-cw.basicPropertyBinding": {
-			"name": "camel.component.aws-cw.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-cw.autowiredEnabled": {
+			"name": "camel.component.aws-cw.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-cw.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink.json
index 4b5b1d1..408e5d3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -213,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ddb.basicPropertyBinding": {
-			"name": "camel.component.aws-ddb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ddb.autowiredEnabled": {
+			"name": "camel.component.aws-ddb.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-ddb.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddbstream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddbstream-source.json
index 4d82a94..a5fd1bf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddbstream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddbstream-source.json
@@ -104,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -293,11 +286,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ddbstream.basicPropertyBinding": {
-			"name": "camel.component.aws-ddbstream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ddbstream.autowiredEnabled": {
+			"name": "camel.component.aws-ddbstream.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-ddbstream.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink.json
index dfc8181..9f8e241 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ec2.basicPropertyBinding": {
-			"name": "camel.component.aws-ec2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ec2.autowiredEnabled": {
+			"name": "camel.component.aws-ec2.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ecs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ecs-sink.json
index b8386f7..aeaca5c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ecs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ecs-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ecs.basicPropertyBinding": {
-			"name": "camel.component.aws-ecs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ecs.autowiredEnabled": {
+			"name": "camel.component.aws-ecs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-eks-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-eks-sink.json
index e75535d..13c143a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-eks-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-eks-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-eks.basicPropertyBinding": {
-			"name": "camel.component.aws-eks.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-eks.autowiredEnabled": {
+			"name": "camel.component.aws-eks.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-iam-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-iam-sink.json
index 4e31313..5142ace 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-iam-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-iam-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-iam.basicPropertyBinding": {
-			"name": "camel.component.aws-iam.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-iam.autowiredEnabled": {
+			"name": "camel.component.aws-iam.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink.json
index b6ca7a8..9f4cb23 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,11 +130,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kinesis-firehose.basicPropertyBinding": {
-			"name": "camel.component.aws-kinesis-firehose.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kinesis-firehose.autowiredEnabled": {
+			"name": "camel.component.aws-kinesis-firehose.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-kinesis-firehose.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink.json
index 15df906..48e1f19 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,11 +130,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kinesis.basicPropertyBinding": {
-			"name": "camel.component.aws-kinesis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kinesis.autowiredEnabled": {
+			"name": "camel.component.aws-kinesis.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-kinesis.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source.json
index 25b1050..2d6e9a0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source.json
@@ -118,13 +118,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -321,11 +314,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kinesis.basicPropertyBinding": {
-			"name": "camel.component.aws-kinesis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kinesis.autowiredEnabled": {
+			"name": "camel.component.aws-kinesis.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-kinesis.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kms-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kms-sink.json
index c9cd26c..221f341 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kms-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kms-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kms.basicPropertyBinding": {
-			"name": "camel.component.aws-kms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kms.autowiredEnabled": {
+			"name": "camel.component.aws-kms.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink.json
index 7531787..6aa4ab4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -126,19 +119,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws-lambda.autowiredEnabled": {
+			"name": "camel.component.aws-lambda.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws-lambda.awsLambdaClient": {
 			"name": "camel.component.aws-lambda.awsLambdaClient",
 			"description": "To use a existing configured AwsLambdaClient as client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-lambda.basicPropertyBinding": {
-			"name": "camel.component.aws-lambda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
-			"required": "false"
-		},
 		"camel.component.aws-lambda.proxyHost": {
 			"name": "camel.component.aws-lambda.proxyHost",
 			"description": "To define a proxy host when instantiating the Lambda client",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-mq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-mq-sink.json
index 4791c5a..e800afa 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-mq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-mq-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-mq.basicPropertyBinding": {
-			"name": "camel.component.aws-mq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-mq.autowiredEnabled": {
+			"name": "camel.component.aws-mq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-msk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-msk-sink.json
index b82d2de..be4d8c2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-msk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-msk-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-msk.basicPropertyBinding": {
-			"name": "camel.component.aws-msk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-msk.autowiredEnabled": {
+			"name": "camel.component.aws-msk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink.json
index e4dcdbf..493c281 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink.json
@@ -199,13 +199,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -415,11 +408,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-s3.basicPropertyBinding": {
-			"name": "camel.component.aws-s3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-s3.autowiredEnabled": {
+			"name": "camel.component.aws-s3.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-s3.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-source.json
index 7a17688..4fb886c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-source.json
@@ -219,13 +219,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -509,11 +502,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-s3.basicPropertyBinding": {
-			"name": "camel.component.aws-s3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-s3.autowiredEnabled": {
+			"name": "camel.component.aws-s3.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-s3.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sdb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sdb-sink.json
index 0e037a9..1fd578d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sdb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sdb-sink.json
@@ -85,13 +85,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,11 +99,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sdb.basicPropertyBinding": {
-			"name": "camel.component.aws-sdb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sdb.autowiredEnabled": {
+			"name": "camel.component.aws-sdb.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink.json
index 019edf5..e3e50c0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -185,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ses.basicPropertyBinding": {
-			"name": "camel.component.aws-ses.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ses.autowiredEnabled": {
+			"name": "camel.component.aws-ses.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-ses.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink.json
index ba2b1da..e28ce47 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink.json
@@ -123,13 +123,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -257,11 +250,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sns.basicPropertyBinding": {
-			"name": "camel.component.aws-sns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sns.autowiredEnabled": {
+			"name": "camel.component.aws-sns.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-sns.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink.json
index e9e19a8..acaebde 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink.json
@@ -106,13 +106,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.delayQueue": {
 			"name": "camel.sink.endpoint.delayQueue",
 			"description": "Define if you want to apply delaySeconds option to the queue or on single messages",
@@ -278,11 +271,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sqs.basicPropertyBinding": {
-			"name": "camel.component.aws-sqs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sqs.autowiredEnabled": {
+			"name": "camel.component.aws-sqs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-sqs.delayQueue": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source.json
index 5ecb585..2aa2267 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source.json
@@ -189,13 +189,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.delayQueue": {
 			"name": "camel.source.endpoint.delayQueue",
 			"description": "Define if you want to apply delaySeconds option to the queue or on single messages",
@@ -506,11 +499,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sqs.basicPropertyBinding": {
-			"name": "camel.component.aws-sqs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sqs.autowiredEnabled": {
+			"name": "camel.component.aws-sqs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-sqs.delayQueue": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-sink.json
index 9787bf1..a29a544 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-sink.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientConfigurationParameters": {
 			"name": "camel.sink.endpoint.clientConfigurationParameters",
 			"description": "To configure the ClientConfiguration using the key\/values from the Map.",
@@ -214,11 +207,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-swf.basicPropertyBinding": {
-			"name": "camel.component.aws-swf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-swf.autowiredEnabled": {
+			"name": "camel.component.aws-swf.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-swf.clientConfigurationParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-source.json
index 96f1cea..6ae4000 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.clientConfigurationParameters": {
 			"name": "camel.source.endpoint.clientConfigurationParameters",
 			"description": "To configure the ClientConfiguration using the key\/values from the Map.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-swf.basicPropertyBinding": {
-			"name": "camel.component.aws-swf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-swf.autowiredEnabled": {
+			"name": "camel.component.aws-swf.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-swf.clientConfigurationParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-translate-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-translate-sink.json
index 7f4e66b..6bac73f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-translate-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-translate-sink.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -201,11 +194,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-translate.basicPropertyBinding": {
-			"name": "camel.component.aws-translate.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-translate.autowiredEnabled": {
+			"name": "camel.component.aws-translate.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-athena-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-athena-sink.json
index a1e1013..b6315b8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-athena-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-athena-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key.",
@@ -189,13 +182,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientRequestToken": {
 			"name": "camel.sink.endpoint.clientRequestToken",
 			"description": "A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this.",
@@ -221,13 +207,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-athena.autoDiscoverClient": {
-			"name": "camel.component.aws2-athena.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-athena.configuration": {
 			"name": "camel.component.aws2-athena.configuration",
 			"description": "The component configuration.",
@@ -389,11 +368,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-athena.basicPropertyBinding": {
-			"name": "camel.component.aws2-athena.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-athena.autowiredEnabled": {
+			"name": "camel.component.aws2-athena.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-athena.clientRequestToken": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json
index 656469a..10f93b9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -91,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -123,13 +109,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-cw.autoDiscoverClient": {
-			"name": "camel.component.aws2-cw.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-cw.configuration": {
 			"name": "camel.component.aws2-cw.configuration",
 			"description": "The component configuration",
@@ -199,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-cw.basicPropertyBinding": {
-			"name": "camel.component.aws2-cw.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-cw.autowiredEnabled": {
+			"name": "camel.component.aws2-cw.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-cw.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json
index 062950f..237b751 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.consistentRead": {
 			"name": "camel.sink.endpoint.consistentRead",
 			"description": "Determines whether or not strong consistency should be enforced when data is read.",
@@ -105,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,13 +123,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddb.autoDiscoverClient": {
-			"name": "camel.component.aws2-ddb.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ddb.configuration": {
 			"name": "camel.component.aws2-ddb.configuration",
 			"description": "The component configuration",
@@ -227,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddb.basicPropertyBinding": {
-			"name": "camel.component.aws2-ddb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ddb.autowiredEnabled": {
+			"name": "camel.component.aws2-ddb.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-ddb.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
index fcf834d..3a6f737 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.source.endpoint.autoDiscoverClient": {
-			"name": "camel.source.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.amazonDynamoDbStreamsClient": {
 			"name": "camel.source.endpoint.amazonDynamoDbStreamsClient",
 			"description": "Amazon DynamoDB client to use for all requests for this endpoint",
@@ -111,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -230,13 +216,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.autoDiscoverClient": {
-			"name": "camel.component.aws2-ddbstream.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ddbstream.amazonDynamoDbStreamsClient": {
 			"name": "camel.component.aws2-ddbstream.amazonDynamoDbStreamsClient",
 			"description": "Amazon DynamoDB client to use for all requests for this endpoint",
@@ -307,11 +286,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.basicPropertyBinding": {
-			"name": "camel.component.aws2-ddbstream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ddbstream.autowiredEnabled": {
+			"name": "camel.component.aws2-ddbstream.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-ddbstream.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json
index d11bcff..f547ded 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -92,13 +85,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ec2.autoDiscoverClient": {
-			"name": "camel.component.aws2-ec2.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ec2.accessKey": {
 			"name": "camel.component.aws2-ec2.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -189,11 +168,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ec2.basicPropertyBinding": {
-			"name": "camel.component.aws2-ec2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ec2.autowiredEnabled": {
+			"name": "camel.component.aws2-ec2.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json
index 0287c57..cc45888 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.ecsClient": {
 			"name": "camel.sink.endpoint.ecsClient",
 			"description": "To use a existing configured AWS ECS as client",
@@ -80,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ecs.autoDiscoverClient": {
-			"name": "camel.component.aws2-ecs.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ecs.configuration": {
 			"name": "camel.component.aws2-ecs.configuration",
 			"description": "Component configuration",
@@ -177,11 +156,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ecs.basicPropertyBinding": {
-			"name": "camel.component.aws2-ecs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ecs.autowiredEnabled": {
+			"name": "camel.component.aws2-ecs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-ecs.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json
index bfc70b5..56e9715 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.eksClient": {
 			"name": "camel.sink.endpoint.eksClient",
 			"description": "To use a existing configured AWS EKS as client",
@@ -80,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-eks.autoDiscoverClient": {
-			"name": "camel.component.aws2-eks.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-eks.configuration": {
 			"name": "camel.component.aws2-eks.configuration",
 			"description": "Component configuration",
@@ -177,11 +156,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-eks.basicPropertyBinding": {
-			"name": "camel.component.aws2-eks.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-eks.autowiredEnabled": {
+			"name": "camel.component.aws2-eks.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-eks.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json
index 83bdbcf..0b297d0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.eventbridgeClient": {
 			"name": "camel.sink.endpoint.eventbridgeClient",
 			"description": "To use a existing configured AWS Eventbridge as client",
@@ -87,13 +80,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -113,13 +99,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-eventbridge.autoDiscoverClient": {
-			"name": "camel.component.aws2-eventbridge.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-eventbridge.configuration": {
 			"name": "camel.component.aws2-eventbridge.configuration",
 			"description": "Component configuration",
@@ -191,11 +170,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-eventbridge.basicPropertyBinding": {
-			"name": "camel.component.aws2-eventbridge.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-eventbridge.autowiredEnabled": {
+			"name": "camel.component.aws2-eventbridge.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-eventbridge.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json
index 08c2c99..8f22852 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.iamClient": {
 			"name": "camel.sink.endpoint.iamClient",
 			"description": "To use a existing configured AWS IAM as client",
@@ -81,13 +74,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -107,13 +93,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-iam.autoDiscoverClient": {
-			"name": "camel.component.aws2-iam.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-iam.configuration": {
 			"name": "camel.component.aws2-iam.configuration",
 			"description": "Component configuration",
@@ -179,11 +158,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-iam.basicPropertyBinding": {
-			"name": "camel.component.aws2-iam.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-iam.autowiredEnabled": {
+			"name": "camel.component.aws2-iam.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-iam.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-firehose-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-firehose-sink.json
index 924f505..bd6fed6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-firehose-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-firehose-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.cborEnabled": {
 			"name": "camel.sink.endpoint.cborEnabled",
 			"description": "This option will set the CBOR_ENABLED property during the execution",
@@ -80,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -112,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kinesis-firehose.autoDiscoverClient": {
-			"name": "camel.component.aws2-kinesis-firehose.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-kinesis-firehose.cborEnabled": {
 			"name": "camel.component.aws2-kinesis-firehose.cborEnabled",
 			"description": "This option will set the CBOR_ENABLED property during the execution",
@@ -177,11 +156,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kinesis-firehose.basicPropertyBinding": {
-			"name": "camel.component.aws2-kinesis-firehose.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-kinesis-firehose.autowiredEnabled": {
+			"name": "camel.component.aws2-kinesis-firehose.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-kinesis-firehose.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-sink.json
index 7164bbf..a93dca4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.cborEnabled": {
 			"name": "camel.sink.endpoint.cborEnabled",
 			"description": "This option will set the CBOR_ENABLED property during the execution",
@@ -74,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kinesis.autoDiscoverClient": {
-			"name": "camel.component.aws2-kinesis.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-kinesis.cborEnabled": {
 			"name": "camel.component.aws2-kinesis.cborEnabled",
 			"description": "This option will set the CBOR_ENABLED property during the execution",
@@ -165,11 +144,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kinesis.basicPropertyBinding": {
-			"name": "camel.component.aws2-kinesis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-kinesis.autowiredEnabled": {
+			"name": "camel.component.aws2-kinesis.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-kinesis.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-source.json
index ac64e66..85e31b7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-source.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.autoDiscoverClient": {
-			"name": "camel.source.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.cborEnabled": {
 			"name": "camel.source.endpoint.cborEnabled",
 			"description": "This option will set the CBOR_ENABLED property during the execution",
@@ -132,13 +125,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -257,13 +243,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kinesis.autoDiscoverClient": {
-			"name": "camel.component.aws2-kinesis.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-kinesis.cborEnabled": {
 			"name": "camel.component.aws2-kinesis.cborEnabled",
 			"description": "This option will set the CBOR_ENABLED property during the execution",
@@ -349,11 +328,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kinesis.basicPropertyBinding": {
-			"name": "camel.component.aws2-kinesis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-kinesis.autowiredEnabled": {
+			"name": "camel.component.aws2-kinesis.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-kinesis.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json
index 93b73f2..6ef3632 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.kmsClient": {
 			"name": "camel.sink.endpoint.kmsClient",
 			"description": "To use a existing configured AWS KMS as client",
@@ -80,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kms.autoDiscoverClient": {
-			"name": "camel.component.aws2-kms.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-kms.configuration": {
 			"name": "camel.component.aws2-kms.configuration",
 			"description": "Component configuration",
@@ -177,11 +156,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kms.basicPropertyBinding": {
-			"name": "camel.component.aws2-kms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-kms.autowiredEnabled": {
+			"name": "camel.component.aws2-kms.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-kms.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json
index fde785a..c633ac1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -62,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -107,13 +93,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-lambda.autoDiscoverClient": {
-			"name": "camel.component.aws2-lambda.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-lambda.configuration": {
 			"name": "camel.component.aws2-lambda.configuration",
 			"description": "Component configuration",
@@ -154,19 +133,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-lambda.autowiredEnabled": {
+			"name": "camel.component.aws2-lambda.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-lambda.awsLambdaClient": {
 			"name": "camel.component.aws2-lambda.awsLambdaClient",
 			"description": "To use a existing configured AwsLambdaClient as client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-lambda.basicPropertyBinding": {
-			"name": "camel.component.aws2-lambda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
-			"required": "false"
-		},
 		"camel.component.aws2-lambda.proxyHost": {
 			"name": "camel.component.aws2-lambda.proxyHost",
 			"description": "To define a proxy host when instantiating the Lambda client",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json
index 7939c06..7e5d312 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -80,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -112,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-mq.autoDiscoverClient": {
-			"name": "camel.component.aws2-mq.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-mq.configuration": {
 			"name": "camel.component.aws2-mq.configuration",
 			"description": "Component configuration",
@@ -177,11 +156,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-mq.basicPropertyBinding": {
-			"name": "camel.component.aws2-mq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-mq.autowiredEnabled": {
+			"name": "camel.component.aws2-mq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-mq.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json
index 660a9d8..80ae5f8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -80,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-msk.autoDiscoverClient": {
-			"name": "camel.component.aws2-msk.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-msk.configuration": {
 			"name": "camel.component.aws2-msk.configuration",
 			"description": "Component configuration",
@@ -177,11 +156,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-msk.basicPropertyBinding": {
-			"name": "camel.component.aws2-msk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-msk.autowiredEnabled": {
+			"name": "camel.component.aws2-msk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-msk.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json
index 498bb23..f3ac579 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json
@@ -21,6 +21,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.amazonS3Presigner": {
+			"name": "camel.sink.endpoint.amazonS3Presigner",
+			"description": "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.autoCreateBucket": {
 			"name": "camel.sink.endpoint.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
@@ -86,9 +92,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.useIAMCredentials": {
-			"name": "camel.sink.endpoint.useIAMCredentials",
-			"description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
+		"camel.sink.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -202,6 +208,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-s3.amazonS3Presigner": {
+			"name": "camel.component.aws2-s3.amazonS3Presigner",
+			"description": "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-s3.autoCreateBucket": {
 			"name": "camel.component.aws2-s3.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
@@ -273,9 +285,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.useIAMCredentials": {
-			"name": "camel.component.aws2-s3.useIAMCredentials",
-			"description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
+		"camel.component.aws2-s3.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-s3.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
index b79d280..6233e34 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
@@ -21,6 +21,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.amazonS3Presigner": {
+			"name": "camel.source.endpoint.amazonS3Presigner",
+			"description": "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.autoCreateBucket": {
 			"name": "camel.source.endpoint.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
@@ -86,9 +92,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.useIAMCredentials": {
-			"name": "camel.source.endpoint.useIAMCredentials",
-			"description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
+		"camel.source.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.source.endpoint.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -346,6 +352,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-s3.amazonS3Presigner": {
+			"name": "camel.component.aws2-s3.amazonS3Presigner",
+			"description": "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-s3.autoCreateBucket": {
 			"name": "camel.component.aws2-s3.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
@@ -417,9 +429,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.useIAMCredentials": {
-			"name": "camel.component.aws2-s3.useIAMCredentials",
-			"description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
+		"camel.component.aws2-s3.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-s3.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json
index 64a5f5d..3454538 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -91,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -123,13 +109,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ses.autoDiscoverClient": {
-			"name": "camel.component.aws2-ses.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ses.configuration": {
 			"name": "camel.component.aws2-ses.configuration",
 			"description": "component configuration",
@@ -199,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ses.basicPropertyBinding": {
-			"name": "camel.component.aws2-ses.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ses.autowiredEnabled": {
+			"name": "camel.component.aws2-ses.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-ses.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json
index d9a0728..49fb584 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to map headers to\/from Camel.",
@@ -124,9 +117,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+		"camel.sink.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -163,13 +156,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sns.autoDiscoverClient": {
-			"name": "camel.component.aws2-sns.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-sns.configuration": {
 			"name": "camel.component.aws2-sns.configuration",
 			"description": "Component configuration",
@@ -259,11 +245,18 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sns.basicPropertyBinding": {
-			"name": "camel.component.aws2-sns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+		"camel.component.aws2-sns.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-sns.useDefaultCredentialsProvider",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
-			"priority": "LOW",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.aws2-sns.autowiredEnabled": {
+			"name": "camel.component.aws2-sns.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-sns.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
index 35164dc..f731da7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
@@ -35,13 +35,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to map headers to\/from Camel.",
@@ -81,8 +74,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.useIAMCredentials": {
-			"name": "camel.sink.endpoint.useIAMCredentials",
+		"camel.sink.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
@@ -120,13 +113,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.delayQueue": {
 			"name": "camel.sink.endpoint.delayQueue",
 			"description": "Define if you want to apply delaySeconds option to the queue or on single messages",
@@ -221,13 +207,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.autoDiscoverClient": {
-			"name": "camel.component.aws2-sqs.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-sqs.configuration": {
 			"name": "camel.component.aws2-sqs.configuration",
 			"description": "The AWS SQS default configuration",
@@ -267,8 +246,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.useIAMCredentials": {
-			"name": "camel.component.aws2-sqs.useIAMCredentials",
+		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
@@ -306,11 +285,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.basicPropertyBinding": {
-			"name": "camel.component.aws2-sqs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-sqs.autowiredEnabled": {
+			"name": "camel.component.aws2-sqs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-sqs.delayQueue": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
index 7684b15..03e382c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
@@ -35,13 +35,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.autoDiscoverClient": {
-			"name": "camel.source.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to map headers to\/from Camel.",
@@ -81,8 +74,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.useIAMCredentials": {
-			"name": "camel.source.endpoint.useIAMCredentials",
+		"camel.source.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.source.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
@@ -203,13 +196,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.delayQueue": {
 			"name": "camel.source.endpoint.delayQueue",
 			"description": "Define if you want to apply delaySeconds option to the queue or on single messages",
@@ -397,13 +383,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.autoDiscoverClient": {
-			"name": "camel.component.aws2-sqs.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-sqs.configuration": {
 			"name": "camel.component.aws2-sqs.configuration",
 			"description": "The AWS SQS default configuration",
@@ -443,8 +422,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.useIAMCredentials": {
-			"name": "camel.component.aws2-sqs.useIAMCredentials",
+		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
@@ -534,11 +513,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.basicPropertyBinding": {
-			"name": "camel.component.aws2-sqs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-sqs.autowiredEnabled": {
+			"name": "camel.component.aws2-sqs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-sqs.delayQueue": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sts-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sts-sink.json
index 204823e..f78d957 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sts-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sts-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -82,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -108,13 +94,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sts.autoDiscoverClient": {
-			"name": "camel.component.aws2-sts.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-sts.configuration": {
 			"name": "camel.component.aws2-sts.configuration",
 			"description": "Component configuration",
@@ -181,11 +160,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sts.basicPropertyBinding": {
-			"name": "camel.component.aws2-sts.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-sts.autowiredEnabled": {
+			"name": "camel.component.aws2-sts.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-sts.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
index dbd3df7..728a69d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -100,13 +93,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -133,13 +119,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.autoDiscoverClient": {
-			"name": "camel.component.aws2-translate.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-translate.configuration": {
 			"name": "camel.component.aws2-translate.configuration",
 			"description": "Component configuration",
@@ -217,11 +196,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.basicPropertyBinding": {
-			"name": "camel.component.aws2-translate.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-translate.autowiredEnabled": {
+			"name": "camel.component.aws2-translate.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-translate.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-sink.json
index ba81f00..bc13b85 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-sink.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -263,11 +256,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-blob.basicPropertyBinding": {
-			"name": "camel.component.azure-blob.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-blob.autowiredEnabled": {
+			"name": "camel.component.azure-blob.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-blob.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-source.json
index 6664ec0..727fae7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-source.json
@@ -99,13 +99,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -197,11 +190,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-blob.basicPropertyBinding": {
-			"name": "camel.component.azure-blob.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-blob.autowiredEnabled": {
+			"name": "camel.component.azure-blob.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-blob.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-sink.json
index cd82523..5772dc5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -149,11 +142,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-eventhubs.basicPropertyBinding": {
-			"name": "camel.component.azure-eventhubs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-eventhubs.autowiredEnabled": {
+			"name": "camel.component.azure-eventhubs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-eventhubs.connectionString": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-source.json
index 5f7d164..7a7f271 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-source.json
@@ -111,13 +111,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -227,11 +220,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-eventhubs.basicPropertyBinding": {
-			"name": "camel.component.azure-eventhubs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-eventhubs.autowiredEnabled": {
+			"name": "camel.component.azure-eventhubs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-eventhubs.connectionString": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-sink.json
index 3f4df98..44c36ae 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -143,11 +136,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-queue.basicPropertyBinding": {
-			"name": "camel.component.azure-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-queue.autowiredEnabled": {
+			"name": "camel.component.azure-queue.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-queue.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-source.json
index e372fa5..b83a303 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-source.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -105,11 +98,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-queue.basicPropertyBinding": {
-			"name": "camel.component.azure-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-queue.autowiredEnabled": {
+			"name": "camel.component.azure-queue.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-queue.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json
index fcf267d..f9bc8ab 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -369,11 +362,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-storage-blob.basicPropertyBinding": {
-			"name": "camel.component.azure-storage-blob.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-storage-blob.autowiredEnabled": {
+			"name": "camel.component.azure-storage-blob.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-storage-blob.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json
index 26374df..c9f8601 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json
@@ -135,13 +135,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -257,11 +250,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-storage-blob.basicPropertyBinding": {
-			"name": "camel.component.azure-storage-blob.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-storage-blob.autowiredEnabled": {
+			"name": "camel.component.azure-storage-blob.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-storage-blob.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-sink.json
index db772b0..3149f2c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-sink.json
@@ -54,13 +54,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -156,11 +149,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-storage-queue.basicPropertyBinding": {
-			"name": "camel.component.azure-storage-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-storage-queue.autowiredEnabled": {
+			"name": "camel.component.azure-storage-queue.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-storage-queue.maxMessages": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-source.json
index 840b43a..06350d7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-source.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -142,11 +135,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-storage-queue.basicPropertyBinding": {
-			"name": "camel.component.azure-storage-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-storage-queue.autowiredEnabled": {
+			"name": "camel.component.azure-storage-queue.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-storage-queue.maxMessages": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-bean-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-bean-sink.json
index e11e2c2..22125e0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-bean-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-bean-sink.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.parameters": {
 			"name": "camel.sink.endpoint.parameters",
 			"description": "Used for configuring additional properties on the bean",
@@ -82,11 +75,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.bean.basicPropertyBinding": {
-			"name": "camel.component.bean.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.bean.autowiredEnabled": {
+			"name": "camel.component.bean.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-sink.json
index b6f1984..f51f7cc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-sink.json
@@ -49,13 +49,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -70,11 +63,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.beanstalk.basicPropertyBinding": {
-			"name": "camel.component.beanstalk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.beanstalk.autowiredEnabled": {
+			"name": "camel.component.beanstalk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.beanstalk.connectionSettingsFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-source.json
index f0d7740..fa4b6c7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-source.json
@@ -94,13 +94,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -208,11 +201,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.beanstalk.basicPropertyBinding": {
-			"name": "camel.component.beanstalk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.beanstalk.autowiredEnabled": {
+			"name": "camel.component.beanstalk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.beanstalk.connectionSettingsFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-sink.json
index dadfe60..a2e8af0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-sink.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.httpParams": {
 			"name": "camel.sink.endpoint.httpParams",
 			"description": "Custom HTTP params for settings like proxy host",
@@ -172,11 +165,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.box.basicPropertyBinding": {
-			"name": "camel.component.box.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.box.autowiredEnabled": {
+			"name": "camel.component.box.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.box.httpParams": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-source.json
index 934fa84..9e546ef 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-source.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.httpParams": {
 			"name": "camel.source.endpoint.httpParams",
 			"description": "Custom HTTP params for settings like proxy host",
@@ -177,11 +170,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.box.basicPropertyBinding": {
-			"name": "camel.component.box.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.box.autowiredEnabled": {
+			"name": "camel.component.box.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.box.httpParams": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-braintree-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-braintree-sink.json
index 914d1a4..60a4b66 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-braintree-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-braintree-sink.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.httpReadTimeout": {
 			"name": "camel.sink.endpoint.httpReadTimeout",
 			"description": "Set read timeout for http calls.",
@@ -123,11 +116,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.braintree.basicPropertyBinding": {
-			"name": "camel.component.braintree.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.braintree.autowiredEnabled": {
+			"name": "camel.component.braintree.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.braintree.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-cache-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-cache-sink.json
index 06ccc33..d750804 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-cache-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-cache-sink.json
@@ -101,13 +101,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.keyType": {
 			"name": "camel.sink.endpoint.keyType",
 			"description": "The cache key type, default java.lang.Object",
@@ -213,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.caffeine-cache.basicPropertyBinding": {
-			"name": "camel.component.caffeine-cache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.caffeine-cache.autowiredEnabled": {
+			"name": "camel.component.caffeine-cache.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.caffeine-cache.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-loadcache-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-loadcache-sink.json
index 67ac789..3d90fa2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-loadcache-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-loadcache-sink.json
@@ -101,13 +101,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.keyType": {
 			"name": "camel.sink.endpoint.keyType",
 			"description": "The cache key type, default java.lang.Object",
@@ -213,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.caffeine-loadcache.basicPropertyBinding": {
-			"name": "camel.component.caffeine-loadcache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.caffeine-loadcache.autowiredEnabled": {
+			"name": "camel.component.caffeine-loadcache.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.caffeine-loadcache.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chatscript-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chatscript-sink.json
index 00bb345..1cd514a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chatscript-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chatscript-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -69,11 +62,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.chatscript.basicPropertyBinding": {
-			"name": "camel.component.chatscript.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.chatscript.autowiredEnabled": {
+			"name": "camel.component.chatscript.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chunk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chunk-sink.json
index 6da2ef1..092ec55 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chunk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chunk-sink.json
@@ -73,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -108,11 +101,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.chunk.basicPropertyBinding": {
-			"name": "camel.component.chunk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.chunk.autowiredEnabled": {
+			"name": "camel.component.chunk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cm-sms-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cm-sms-sink.json
index fe28c66..a6278d4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cm-sms-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cm-sms-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -69,11 +62,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cm-sms.basicPropertyBinding": {
-			"name": "camel.component.cm-sms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cm-sms.autowiredEnabled": {
+			"name": "camel.component.cm-sms.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-sink.json
index 5fda53b..50af492 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.sessionFacadeFactory": {
 			"name": "camel.sink.endpoint.sessionFacadeFactory",
 			"description": "To use a custom CMISSessionFacadeFactory to create the CMISSessionFacade instances",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cmis.basicPropertyBinding": {
-			"name": "camel.component.cmis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cmis.autowiredEnabled": {
+			"name": "camel.component.cmis.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cmis.sessionFacadeFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-source.json
index 2488598..c034baa 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-source.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.sessionFacadeFactory": {
 			"name": "camel.source.endpoint.sessionFacadeFactory",
 			"description": "To use a custom CMISSessionFacadeFactory to create the CMISSessionFacade instances",
@@ -105,11 +98,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cmis.basicPropertyBinding": {
-			"name": "camel.component.cmis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cmis.autowiredEnabled": {
+			"name": "camel.component.cmis.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cmis.sessionFacadeFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-sink.json
index a6c41f5..720940c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coap-tcp.basicPropertyBinding": {
-			"name": "camel.component.coap-tcp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coap-tcp.autowiredEnabled": {
+			"name": "camel.component.coap-tcp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-source.json
index 1cb6177..4d9c186 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -116,11 +109,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coap-tcp.basicPropertyBinding": {
-			"name": "camel.component.coap-tcp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coap-tcp.autowiredEnabled": {
+			"name": "camel.component.coap-tcp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-sink.json
index bc385e4..3a65fba 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coap.basicPropertyBinding": {
-			"name": "camel.component.coap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coap.autowiredEnabled": {
+			"name": "camel.component.coap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-source.json
index 8825030..c392b41 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -116,11 +109,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coap.basicPropertyBinding": {
-			"name": "camel.component.coap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coap.autowiredEnabled": {
+			"name": "camel.component.coap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-sink.json
index 7be5996..d692c63 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coaps-tcp.basicPropertyBinding": {
-			"name": "camel.component.coaps-tcp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coaps-tcp.autowiredEnabled": {
+			"name": "camel.component.coaps-tcp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-source.json
index edcf19d..d3330f8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -116,11 +109,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coaps-tcp.basicPropertyBinding": {
-			"name": "camel.component.coaps-tcp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coaps-tcp.autowiredEnabled": {
+			"name": "camel.component.coaps-tcp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-sink.json
index 35414b1..4f9d555 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coaps.basicPropertyBinding": {
-			"name": "camel.component.coaps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coaps.autowiredEnabled": {
+			"name": "camel.component.coaps.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-source.json
index ac23d88..b380b17 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -116,11 +109,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coaps.basicPropertyBinding": {
-			"name": "camel.component.coaps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coaps.autowiredEnabled": {
+			"name": "camel.component.coaps.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-sink.json
index d25ad0e..bdac5d2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-sink.json
@@ -108,13 +108,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cometd.basicPropertyBinding": {
-			"name": "camel.component.cometd.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cometd.autowiredEnabled": {
+			"name": "camel.component.cometd.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cometd.extensions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-source.json
index d6674ca..7f2b555 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-source.json
@@ -120,13 +120,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -141,11 +134,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cometd.basicPropertyBinding": {
-			"name": "camel.component.cometd.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cometd.autowiredEnabled": {
+			"name": "camel.component.cometd.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cometd.extensions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-sink.json
index 5060f9f..7508551 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-sink.json
@@ -108,13 +108,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cometds.basicPropertyBinding": {
-			"name": "camel.component.cometds.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cometds.autowiredEnabled": {
+			"name": "camel.component.cometds.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cometds.extensions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-source.json
index 379a192..4bf6c37 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-source.json
@@ -120,13 +120,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -141,11 +134,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cometds.basicPropertyBinding": {
-			"name": "camel.component.cometds.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cometds.autowiredEnabled": {
+			"name": "camel.component.cometds.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cometds.extensions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-sink.json
index 8900538..14e0769 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-sink.json
@@ -102,13 +102,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.consistencyMode": {
 			"name": "camel.sink.endpoint.consistencyMode",
 			"description": "The consistencyMode used for queries, default ConsistencyMode.DEFAULT One of: [DEFAULT] [STALE] [CONSISTENT]",
@@ -252,11 +245,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.consul.basicPropertyBinding": {
-			"name": "camel.component.consul.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.consul.autowiredEnabled": {
+			"name": "camel.component.consul.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.consul.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-source.json
index 083f50e..25516cb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-source.json
@@ -101,13 +101,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.consistencyMode": {
 			"name": "camel.source.endpoint.consistencyMode",
 			"description": "The consistencyMode used for queries, default ConsistencyMode.DEFAULT One of: [DEFAULT] [STALE] [CONSISTENT]",
@@ -259,11 +252,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.consul.basicPropertyBinding": {
-			"name": "camel.component.consul.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.consul.autowiredEnabled": {
+			"name": "camel.component.consul.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.consul.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-controlbus-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-controlbus-sink.json
index 791893f..b85e5b0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-controlbus-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-controlbus-sink.json
@@ -61,13 +61,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -82,11 +75,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.controlbus.basicPropertyBinding": {
-			"name": "camel.component.controlbus.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.controlbus.autowiredEnabled": {
+			"name": "camel.component.controlbus.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-sink.json
index 0b3ce91..170e27f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.corda.basicPropertyBinding": {
-			"name": "camel.component.corda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.corda.autowiredEnabled": {
+			"name": "camel.component.corda.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.corda.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-source.json
index e79d1fa..2f69199 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.corda.basicPropertyBinding": {
-			"name": "camel.component.corda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.corda.autowiredEnabled": {
+			"name": "camel.component.corda.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.corda.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
index 0d2f926..9f09af5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
@@ -113,10 +113,10 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
+		"camel.sink.endpoint.connectTimeout": {
+			"name": "camel.sink.endpoint.connectTimeout",
+			"description": "Define the timeoutconnect in milliseconds",
+			"defaultValue": "2500L",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -153,11 +153,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.couchbase.basicPropertyBinding": {
-			"name": "camel.component.couchbase.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.couchbase.autowiredEnabled": {
+			"name": "camel.component.couchbase.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json
index 59fba50..c5397eb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json
@@ -80,6 +80,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.fullDocument": {
+			"name": "camel.source.endpoint.fullDocument",
+			"description": "If true consumer will return complete document instead data defined in view",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.limit": {
 			"name": "camel.source.endpoint.limit",
 			"description": "The output limit to use",
@@ -144,10 +151,10 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
+		"camel.source.endpoint.connectTimeout": {
+			"name": "camel.source.endpoint.connectTimeout",
+			"description": "Define the timeoutconnect in milliseconds",
+			"defaultValue": "2500L",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -277,11 +284,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.couchbase.basicPropertyBinding": {
-			"name": "camel.component.couchbase.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.couchbase.autowiredEnabled": {
+			"name": "camel.component.couchbase.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-sink.json
index 5f8ba53..594adbe 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -81,11 +74,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.couchdb.basicPropertyBinding": {
-			"name": "camel.component.couchdb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.couchdb.autowiredEnabled": {
+			"name": "camel.component.couchdb.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-source.json
index a02dc67..a49469e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-source.json
@@ -94,13 +94,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -127,11 +120,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.couchdb.basicPropertyBinding": {
-			"name": "camel.component.couchdb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.couchdb.autowiredEnabled": {
+			"name": "camel.component.couchdb.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-sink.json
index ea12b51..11f68f9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-sink.json
@@ -102,13 +102,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -123,11 +116,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cql.basicPropertyBinding": {
-			"name": "camel.component.cql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cql.autowiredEnabled": {
+			"name": "camel.component.cql.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-source.json
index 12d7374..f647a3a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-source.json
@@ -127,13 +127,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -241,11 +234,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cql.basicPropertyBinding": {
-			"name": "camel.component.cql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cql.autowiredEnabled": {
+			"name": "camel.component.cql.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cron-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cron-source.json
index 61f2106..f3a9969 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cron-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cron-source.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cron.basicPropertyBinding": {
-			"name": "camel.component.cron.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cron.autowiredEnabled": {
+			"name": "camel.component.cron.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cron.cronService": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-cms-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-cms-sink.json
index c93d64f..f205f2a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-cms-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-cms-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -138,11 +131,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.crypto-cms.basicPropertyBinding": {
-			"name": "camel.component.crypto-cms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.crypto-cms.autowiredEnabled": {
+			"name": "camel.component.crypto-cms.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.crypto-cms.envelopedDataDecryptorConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-sink.json
index 4b11cb8..3c6175e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-sink.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "Set the size of the buffer used to read in the Exchange payload data.",
@@ -227,11 +220,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.crypto.basicPropertyBinding": {
-			"name": "camel.component.crypto.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.crypto.autowiredEnabled": {
+			"name": "camel.component.crypto.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.crypto.bufferSize": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-sink.json
index 4d7d778..8141af6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bus": {
 			"name": "camel.sink.endpoint.bus",
 			"description": "To use a custom configured CXF Bus.",
@@ -245,11 +238,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cxf.basicPropertyBinding": {
-			"name": "camel.component.cxf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cxf.autowiredEnabled": {
+			"name": "camel.component.cxf.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cxf.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-source.json
index 0b95a40..a535eed 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-source.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bus": {
 			"name": "camel.source.endpoint.bus",
 			"description": "To use a custom configured CXF Bus.",
@@ -220,11 +213,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cxf.basicPropertyBinding": {
-			"name": "camel.component.cxf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cxf.autowiredEnabled": {
+			"name": "camel.component.cxf.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cxf.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-sink.json
index 038051f..e9e4920 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-sink.json
@@ -124,13 +124,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom CxfBinding to control the binding between Camel Message and CXF Message.",
@@ -197,11 +190,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cxfrs.basicPropertyBinding": {
-			"name": "camel.component.cxfrs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cxfrs.autowiredEnabled": {
+			"name": "camel.component.cxfrs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cxfrs.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-source.json
index 3088d0d..6f35492 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-source.json
@@ -109,13 +109,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "To use a custom CxfBinding to control the binding between Camel Message and CXF Message.",
@@ -182,11 +175,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cxfrs.basicPropertyBinding": {
-			"name": "camel.component.cxfrs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cxfrs.autowiredEnabled": {
+			"name": "camel.component.cxfrs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cxfrs.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dataformat-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dataformat-sink.json
index 7d5660a..f06b740 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dataformat-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dataformat-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -49,11 +42,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.dataformat.basicPropertyBinding": {
-			"name": "camel.component.dataformat.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.dataformat.autowiredEnabled": {
+			"name": "camel.component.dataformat.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-sink.json
index 4b2910a..7feaab7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-sink.json
@@ -43,13 +43,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -78,11 +71,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.direct.basicPropertyBinding": {
-			"name": "camel.component.direct.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.direct.autowiredEnabled": {
+			"name": "camel.component.direct.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-source.json
index 81bcd27..c801cf2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-source.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -55,11 +48,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.direct.basicPropertyBinding": {
-			"name": "camel.component.direct.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.direct.autowiredEnabled": {
+			"name": "camel.component.direct.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-sink.json
index 2e46031..7b1600b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-sink.json
@@ -49,13 +49,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.propagateProperties": {
 			"name": "camel.sink.endpoint.propagateProperties",
 			"description": "Whether to propagate or not properties from the producer side to the consumer side, and vice versa. Default value: true.",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.direct-vm.basicPropertyBinding": {
-			"name": "camel.component.direct-vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.direct-vm.autowiredEnabled": {
+			"name": "camel.component.direct-vm.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.direct-vm.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-source.json
index 5cd3aed..f3b3b3d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-source.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.propagateProperties": {
 			"name": "camel.source.endpoint.propagateProperties",
 			"description": "Whether to propagate or not properties from the producer side to the consumer side, and vice versa. Default value: true.",
@@ -62,11 +55,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.direct-vm.basicPropertyBinding": {
-			"name": "camel.component.direct-vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.direct-vm.autowiredEnabled": {
+			"name": "camel.component.direct-vm.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.direct-vm.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-sink.json
index 9e6bfe0..f46a021 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-sink.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -99,11 +92,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.disruptor.basicPropertyBinding": {
-			"name": "camel.component.disruptor.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.disruptor.autowiredEnabled": {
+			"name": "camel.component.disruptor.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-source.json
index ff7db81..4d77fc6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-source.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -111,11 +104,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.disruptor.basicPropertyBinding": {
-			"name": "camel.component.disruptor.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.disruptor.autowiredEnabled": {
+			"name": "camel.component.disruptor.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-sink.json
index ef58b8b..f42b31e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-sink.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -99,11 +92,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.disruptor-vm.basicPropertyBinding": {
-			"name": "camel.component.disruptor-vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.disruptor-vm.autowiredEnabled": {
+			"name": "camel.component.disruptor-vm.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-source.json
index 30da73a..0521f25 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-source.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -111,11 +104,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.disruptor-vm.basicPropertyBinding": {
-			"name": "camel.component.disruptor-vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.disruptor-vm.autowiredEnabled": {
+			"name": "camel.component.disruptor-vm.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-djl-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-djl-sink.json
index ea49fb1..3baf0c9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-djl-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-djl-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.djl.basicPropertyBinding": {
-			"name": "camel.component.djl.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.djl.autowiredEnabled": {
+			"name": "camel.component.djl.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dns-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dns-sink.json
index 8177b41..1cbf3f2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dns-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dns-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.dns.basicPropertyBinding": {
-			"name": "camel.component.dns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.dns.autowiredEnabled": {
+			"name": "camel.component.dns.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-sink.json
index 9d03c90..b26174c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.cmdExecFactory": {
 			"name": "camel.sink.endpoint.cmdExecFactory",
 			"description": "The fully qualified class name of the DockerCmdExecFactory implementation to use",
@@ -188,11 +181,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.docker.basicPropertyBinding": {
-			"name": "camel.component.docker.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.docker.autowiredEnabled": {
+			"name": "camel.component.docker.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.docker.cmdExecFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-source.json
index d0b97bf..b5149f7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-source.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.cmdExecFactory": {
 			"name": "camel.source.endpoint.cmdExecFactory",
 			"description": "The fully qualified class name of the DockerCmdExecFactory implementation to use",
@@ -200,11 +193,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.docker.basicPropertyBinding": {
-			"name": "camel.component.docker.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.docker.autowiredEnabled": {
+			"name": "camel.component.docker.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.docker.cmdExecFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dozer-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dozer-sink.json
index 1216fe6..257c7a4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dozer-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dozer-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -80,11 +73,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.dozer.basicPropertyBinding": {
-			"name": "camel.component.dozer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.dozer.autowiredEnabled": {
+			"name": "camel.component.dozer.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-drill-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-drill-sink.json
index 4700406..29e3f24 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-drill-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-drill-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -69,11 +62,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.drill.basicPropertyBinding": {
-			"name": "camel.component.drill.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.drill.autowiredEnabled": {
+			"name": "camel.component.drill.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-sink.json
index 90aeaf9..29e58aa 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-sink.json
@@ -70,13 +70,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.dropbox.basicPropertyBinding": {
-			"name": "camel.component.dropbox.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.dropbox.autowiredEnabled": {
+			"name": "camel.component.dropbox.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-source.json
index 0048253..c0f7e60 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-source.json
@@ -82,13 +82,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -103,11 +96,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.dropbox.basicPropertyBinding": {
-			"name": "camel.component.dropbox.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.dropbox.autowiredEnabled": {
+			"name": "camel.component.dropbox.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-sink.json
index 69e6506..1b3ce3e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.configuration": {
 			"name": "camel.sink.endpoint.configuration",
 			"description": "The default cache configuration to be used to create caches.",
@@ -141,11 +134,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ehcache.basicPropertyBinding": {
-			"name": "camel.component.ehcache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ehcache.autowiredEnabled": {
+			"name": "camel.component.ehcache.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ehcache.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-source.json
index 50afb6e..e7ae72f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-source.json
@@ -79,13 +79,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.configuration": {
 			"name": "camel.source.endpoint.configuration",
 			"description": "The default cache configuration to be used to create caches.",
@@ -169,11 +162,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ehcache.basicPropertyBinding": {
-			"name": "camel.component.ehcache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ehcache.autowiredEnabled": {
+			"name": "camel.component.ehcache.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ehcache.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elasticsearch-rest-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elasticsearch-rest-sink.json
index ea97ab4..c8e5d5a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elasticsearch-rest-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elasticsearch-rest-sink.json
@@ -129,13 +129,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -150,11 +143,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.elasticsearch-rest.basicPropertyBinding": {
-			"name": "camel.component.elasticsearch-rest.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.elasticsearch-rest.autowiredEnabled": {
+			"name": "camel.component.elasticsearch-rest.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.elasticsearch-rest.client": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-sink.json
index 24cab34..6fbdc6d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-sink.json
@@ -107,13 +107,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.elSqlConfig": {
 			"name": "camel.sink.endpoint.elSqlConfig",
 			"description": "To use a specific configured ElSqlConfig. It may be better to use the databaseVendor option instead.",
@@ -184,11 +177,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.elsql.basicPropertyBinding": {
-			"name": "camel.component.elsql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.elsql.autowiredEnabled": {
+			"name": "camel.component.elsql.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.elsql.elSqlConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-source.json
index 4fd6a20..beee596 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-source.json
@@ -176,13 +176,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.elSqlConfig": {
 			"name": "camel.source.endpoint.elSqlConfig",
 			"description": "To use a specific configured ElSqlConfig. It may be better to use the databaseVendor option instead.",
@@ -346,11 +339,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.elsql.basicPropertyBinding": {
-			"name": "camel.component.elsql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.elsql.autowiredEnabled": {
+			"name": "camel.component.elsql.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.elsql.elSqlConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-keys-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-keys-sink.json
index a9072b9..4d22ec1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-keys-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-keys-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -133,11 +126,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.etcd-keys.basicPropertyBinding": {
-			"name": "camel.component.etcd-keys.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.etcd-keys.autowiredEnabled": {
+			"name": "camel.component.etcd-keys.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.etcd-keys.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-sink.json
index 29f18a7..bd34283 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -133,11 +126,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.etcd-stats.basicPropertyBinding": {
-			"name": "camel.component.etcd-stats.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.etcd-stats.autowiredEnabled": {
+			"name": "camel.component.etcd-stats.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.etcd-stats.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-source.json
index 75e296b..ea705f7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-source.json
@@ -88,13 +88,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -267,11 +260,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.etcd-stats.basicPropertyBinding": {
-			"name": "camel.component.etcd-stats.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.etcd-stats.autowiredEnabled": {
+			"name": "camel.component.etcd-stats.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.etcd-stats.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-watch-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-watch-source.json
index a29f515..4325030 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-watch-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-watch-source.json
@@ -75,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.etcd-watch.basicPropertyBinding": {
-			"name": "camel.component.etcd-watch.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.etcd-watch.autowiredEnabled": {
+			"name": "camel.component.etcd-watch.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.etcd-watch.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-exec-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-exec-sink.json
index 8c59022..48d20d8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-exec-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-exec-sink.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -93,11 +86,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.exec.basicPropertyBinding": {
-			"name": "camel.component.exec.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.exec.autowiredEnabled": {
+			"name": "camel.component.exec.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-sink.json
index 85ac1f1..70b840f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-sink.json
@@ -565,13 +565,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -765,11 +758,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.facebook.basicPropertyBinding": {
-			"name": "camel.component.facebook.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.facebook.autowiredEnabled": {
+			"name": "camel.component.facebook.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.facebook.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-source.json
index 72ad9d2..265ddf7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-source.json
@@ -577,13 +577,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -777,11 +770,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.facebook.basicPropertyBinding": {
-			"name": "camel.component.facebook.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.facebook.autowiredEnabled": {
+			"name": "camel.component.facebook.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.facebook.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-sink.json
index 84c89d6..57d8997 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-sink.json
@@ -67,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.client": {
 			"name": "camel.sink.endpoint.client",
 			"description": "To use the custom client",
@@ -235,11 +228,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.fhir.basicPropertyBinding": {
-			"name": "camel.component.fhir.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.fhir.autowiredEnabled": {
+			"name": "camel.component.fhir.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.fhir.client": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-source.json
index fb9960b..70b6288 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-source.json
@@ -92,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.client": {
 			"name": "camel.source.endpoint.client",
 			"description": "To use the custom client",
@@ -353,11 +346,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.fhir.basicPropertyBinding": {
-			"name": "camel.component.fhir.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.fhir.autowiredEnabled": {
+			"name": "camel.component.fhir.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.fhir.client": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json
index ccd2b8b..d0ad9e6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json
@@ -138,13 +138,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).",
@@ -180,11 +173,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.file.basicPropertyBinding": {
-			"name": "camel.component.file.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.file.autowiredEnabled": {
+			"name": "camel.component.file.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-source.json
index d6886c9..241da1e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-source.json
@@ -170,13 +170,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bufferSize": {
 			"name": "camel.source.endpoint.bufferSize",
 			"description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).",
@@ -525,11 +518,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.file.basicPropertyBinding": {
-			"name": "camel.component.file.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.file.autowiredEnabled": {
+			"name": "camel.component.file.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-watch-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-watch-source.json
index 8c3e415..8630d71 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-watch-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-watch-source.json
@@ -97,13 +97,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -153,11 +146,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.file-watch.basicPropertyBinding": {
-			"name": "camel.component.file-watch.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.file-watch.autowiredEnabled": {
+			"name": "camel.component.file-watch.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-sink.json
index fb16a39..c66f383 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-sink.json
@@ -70,13 +70,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.flatpack.basicPropertyBinding": {
-			"name": "camel.component.flatpack.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.flatpack.autowiredEnabled": {
+			"name": "camel.component.flatpack.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-source.json
index 4eadf9e..d7da7d6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -209,11 +202,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.flatpack.basicPropertyBinding": {
-			"name": "camel.component.flatpack.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.flatpack.autowiredEnabled": {
+			"name": "camel.component.flatpack.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flink-sink.json
index b91abe0..b2b5245 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flink-sink.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.flink.basicPropertyBinding": {
-			"name": "camel.component.flink.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.flink.autowiredEnabled": {
+			"name": "camel.component.flink.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fop-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fop-sink.json
index 5396bdb..9fbcf35 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fop-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fop-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -55,11 +48,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.fop.basicPropertyBinding": {
-			"name": "camel.component.fop.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.fop.autowiredEnabled": {
+			"name": "camel.component.fop.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-freemarker-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-freemarker-sink.json
index 753a958..7bf78fa 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-freemarker-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-freemarker-sink.json
@@ -61,13 +61,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -96,11 +89,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.freemarker.basicPropertyBinding": {
-			"name": "camel.component.freemarker.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.freemarker.autowiredEnabled": {
+			"name": "camel.component.freemarker.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.freemarker.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-sink.json
index 4db7308..0a6138f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-sink.json
@@ -207,13 +207,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).",
@@ -330,11 +323,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ftp.basicPropertyBinding": {
-			"name": "camel.component.ftp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ftp.autowiredEnabled": {
+			"name": "camel.component.ftp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-source.json
index 23de80d..ca488d90 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-source.json
@@ -252,13 +252,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bufferSize": {
 			"name": "camel.source.endpoint.bufferSize",
 			"description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).",
@@ -663,11 +656,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ftp.basicPropertyBinding": {
-			"name": "camel.component.ftp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ftp.autowiredEnabled": {
+			"name": "camel.component.ftp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json
index ee1d57e..7aeefb9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json
@@ -207,13 +207,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).",
@@ -381,11 +374,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ftps.basicPropertyBinding": {
-			"name": "camel.component.ftps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ftps.autowiredEnabled": {
+			"name": "camel.component.ftps.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ftps.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json
index 3734e61..58fa685 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json
@@ -252,13 +252,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bufferSize": {
 			"name": "camel.source.endpoint.bufferSize",
 			"description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).",
@@ -714,11 +707,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ftps.basicPropertyBinding": {
-			"name": "camel.component.ftps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ftps.autowiredEnabled": {
+			"name": "camel.component.ftps.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ftps.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ganglia-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ganglia-sink.json
index d16b98e..db4ad6d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ganglia-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ganglia-sink.json
@@ -111,13 +111,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -213,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ganglia.basicPropertyBinding": {
-			"name": "camel.component.ganglia.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ganglia.autowiredEnabled": {
+			"name": "camel.component.ganglia.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ganglia.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-geocoder-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-geocoder-sink.json
index 922c10d..677b4d3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-geocoder-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-geocoder-sink.json
@@ -54,13 +54,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -135,11 +128,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.geocoder.basicPropertyBinding": {
-			"name": "camel.component.geocoder.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.geocoder.autowiredEnabled": {
+			"name": "camel.component.geocoder.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.geocoder.geoApiContext": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json
index bea3a4b..e0242bf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json
@@ -71,13 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.git.basicPropertyBinding": {
-			"name": "camel.component.git.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.git.autowiredEnabled": {
+			"name": "camel.component.git.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json
index a7f7dcd..8827032 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -67,11 +60,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.git.basicPropertyBinding": {
-			"name": "camel.component.git.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.git.autowiredEnabled": {
+			"name": "camel.component.git.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-sink.json
index 481931f..fa11773 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-sink.json
@@ -11,7 +11,7 @@
 	"properties": {
 		"camel.sink.path.type": {
 			"name": "camel.sink.path.type",
-			"description": "What git operation to execute One of: [CLOSEPULLREQUEST] [PULLREQUESTCOMMENT] [COMMIT] [PULLREQUEST] [TAG] [PULLREQUESTSTATE] [PULLREQUESTFILES] [GETCOMMITFILE] [CREATEISSUE]",
+			"description": "What git operation to execute One of: [CLOSEPULLREQUEST] [PULLREQUESTCOMMENT] [COMMIT] [PULLREQUEST] [TAG] [PULLREQUESTSTATE] [PULLREQUESTFILES] [GETCOMMITFILE] [CREATEISSUE] [EVENT]",
 			"priority": "HIGH",
 			"required": "true"
 		},
@@ -70,13 +70,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.github.basicPropertyBinding": {
-			"name": "camel.component.github.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.github.autowiredEnabled": {
+			"name": "camel.component.github.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-source.json
index e6e8679..74c2dcf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-source.json
@@ -11,7 +11,7 @@
 	"properties": {
 		"camel.source.path.type": {
 			"name": "camel.source.path.type",
-			"description": "What git operation to execute One of: [CLOSEPULLREQUEST] [PULLREQUESTCOMMENT] [COMMIT] [PULLREQUEST] [TAG] [PULLREQUESTSTATE] [PULLREQUESTFILES] [GETCOMMITFILE] [CREATEISSUE]",
+			"description": "What git operation to execute One of: [CLOSEPULLREQUEST] [PULLREQUESTCOMMENT] [COMMIT] [PULLREQUEST] [TAG] [PULLREQUESTSTATE] [PULLREQUESTFILES] [GETCOMMITFILE] [CREATEISSUE] [EVENT]",
 			"priority": "HIGH",
 			"required": "true"
 		},
@@ -58,6 +58,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.sendEmptyMessageWhenIdle": {
+			"name": "camel.source.endpoint.sendEmptyMessageWhenIdle",
+			"description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.eventFetchStrategy": {
+			"name": "camel.source.endpoint.eventFetchStrategy",
+			"description": "To specify a custom strategy that configures how the EventsConsumer fetches events.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.exceptionHandler": {
 			"name": "camel.source.endpoint.exceptionHandler",
 			"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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -70,10 +83,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
+		"camel.source.endpoint.pollStrategy": {
+			"name": "camel.source.endpoint.pollStrategy",
+			"description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -84,6 +96,99 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.backoffErrorThreshold": {
+			"name": "camel.source.endpoint.backoffErrorThreshold",
+			"description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.backoffIdleThreshold": {
+			"name": "camel.source.endpoint.backoffIdleThreshold",
+			"description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.backoffMultiplier": {
+			"name": "camel.source.endpoint.backoffMultiplier",
+			"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 again. When this option is in use then backoffIdleThreshold and\/or backoffErrorThreshold must also be configured.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.delay": {
+			"name": "camel.source.endpoint.delay",
+			"description": "Milliseconds before the next poll.",
+			"defaultValue": "500L",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.greedy": {
+			"name": "camel.source.endpoint.greedy",
+			"description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.initialDelay": {
+			"name": "camel.source.endpoint.initialDelay",
+			"description": "Milliseconds before the first poll starts.",
+			"defaultValue": "1000L",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.repeatCount": {
+			"name": "camel.source.endpoint.repeatCount",
+			"description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever.",
+			"defaultValue": "0L",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.runLoggingLevel": {
+			"name": "camel.source.endpoint.runLoggingLevel",
+			"description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the logging level for that. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF]",
+			"defaultValue": "\"TRACE\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.scheduledExecutorService": {
+			"name": "camel.source.endpoint.scheduledExecutorService",
+			"description": "Allows for configuring a custom\/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.scheduler": {
+			"name": "camel.source.endpoint.scheduler",
+			"description": "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler",
+			"defaultValue": "\"none\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.schedulerProperties": {
+			"name": "camel.source.endpoint.schedulerProperties",
+			"description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.startScheduler": {
+			"name": "camel.source.endpoint.startScheduler",
+			"description": "Whether the scheduler should be auto started.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.timeUnit": {
+			"name": "camel.source.endpoint.timeUnit",
+			"description": "Time unit for initialDelay and delay options. One of: [NANOSECONDS] [MICROSECONDS] [MILLISECONDS] [SECONDS] [MINUTES] [HOURS] [DAYS]",
+			"defaultValue": "\"MILLISECONDS\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.useFixedDelay": {
+			"name": "camel.source.endpoint.useFixedDelay",
+			"description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.github.bridgeErrorHandler": {
 			"name": "camel.component.github.bridgeErrorHandler",
 			"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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -91,11 +196,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.github.basicPropertyBinding": {
-			"name": "camel.component.github.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.github.autowiredEnabled": {
+			"name": "camel.component.github.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sink.json
index c65c0c1..50fd4e3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sink.json
@@ -29,7 +29,7 @@
 		},
 		"camel.sink.endpoint.connectionFactory": {
 			"name": "camel.sink.endpoint.connectionFactory",
-			"description": "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used",
+			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -62,7 +55,7 @@
 		},
 		"camel.component.google-bigquery.connectionFactory": {
 			"name": "camel.component.google-bigquery.connectionFactory",
-			"description": "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used",
+			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -85,11 +78,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-bigquery.basicPropertyBinding": {
-			"name": "camel.component.google-bigquery.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-bigquery.autowiredEnabled": {
+			"name": "camel.component.google-bigquery.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
index 3ab7c7a..bc125cd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
@@ -23,7 +23,7 @@
 		},
 		"camel.sink.endpoint.connectionFactory": {
 			"name": "camel.sink.endpoint.connectionFactory",
-			"description": "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used",
+			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -50,7 +43,7 @@
 		},
 		"camel.component.google-bigquery-sql.connectionFactory": {
 			"name": "camel.component.google-bigquery-sql.connectionFactory",
-			"description": "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used",
+			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -67,11 +60,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-bigquery-sql.basicPropertyBinding": {
-			"name": "camel.component.google-bigquery-sql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-bigquery-sql.autowiredEnabled": {
+			"name": "camel.component.google-bigquery-sql.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-sink.json
index f3fb195..da2c84f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-sink.json
@@ -71,13 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -153,11 +146,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-calendar.basicPropertyBinding": {
-			"name": "camel.component.google-calendar.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-calendar.autowiredEnabled": {
+			"name": "camel.component.google-calendar.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-calendar.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-source.json
index e8430e5..1d22d4e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-source.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -271,11 +264,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-calendar.basicPropertyBinding": {
-			"name": "camel.component.google-calendar.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-calendar.autowiredEnabled": {
+			"name": "camel.component.google-calendar.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-calendar.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-stream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-stream-source.json
index 35faf42..3eb0b44 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-stream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-stream-source.json
@@ -99,13 +99,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -289,11 +282,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-calendar-stream.basicPropertyBinding": {
-			"name": "camel.component.google-calendar-stream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-calendar-stream.autowiredEnabled": {
+			"name": "camel.component.google-calendar-stream.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-calendar-stream.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-sink.json
index 2cd3aa7..cfbbb63 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-sink.json
@@ -58,13 +58,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -121,11 +114,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-drive.basicPropertyBinding": {
-			"name": "camel.component.google-drive.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-drive.autowiredEnabled": {
+			"name": "camel.component.google-drive.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-drive.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-source.json
index e8a3c56..c594957 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-source.json
@@ -83,13 +83,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -239,11 +232,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-drive.basicPropertyBinding": {
-			"name": "camel.component.google-drive.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-drive.autowiredEnabled": {
+			"name": "camel.component.google-drive.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-drive.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-sink.json
index 282c1de..a30fc68 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-sink.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -103,11 +96,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-mail.basicPropertyBinding": {
-			"name": "camel.component.google-mail.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-mail.autowiredEnabled": {
+			"name": "camel.component.google-mail.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-mail.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-source.json
index d769b34..3d17168 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-source.json
@@ -71,13 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -221,11 +214,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-mail.basicPropertyBinding": {
-			"name": "camel.component.google-mail.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-mail.autowiredEnabled": {
+			"name": "camel.component.google-mail.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-mail.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-stream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-stream-source.json
index b094a69..c6d5387 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-stream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-stream-source.json
@@ -86,13 +86,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -257,11 +250,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-mail-stream.basicPropertyBinding": {
-			"name": "camel.component.google-mail-stream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-mail-stream.autowiredEnabled": {
+			"name": "camel.component.google-mail-stream.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-mail-stream.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json
index 5a4d35a..a5fdc30 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json
@@ -62,10 +62,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
+		"camel.sink.endpoint.serializer": {
+			"name": "camel.sink.endpoint.serializer",
+			"description": "A custom GooglePubsubSerializer to use for serializing message payloads in the producer",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -101,11 +100,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-pubsub.basicPropertyBinding": {
-			"name": "camel.component.google-pubsub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-pubsub.autowiredEnabled": {
+			"name": "camel.component.google-pubsub.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-pubsub.publisherTerminationTimeout": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json
index 59726a8..56baf37 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json
@@ -74,13 +74,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -101,11 +94,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-pubsub.basicPropertyBinding": {
-			"name": "camel.component.google-pubsub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-pubsub.autowiredEnabled": {
+			"name": "camel.component.google-pubsub.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-pubsub.publisherTerminationTimeout": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-sink.json
index 15251ab..c2679b2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-sink.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -103,11 +96,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-sheets.basicPropertyBinding": {
-			"name": "camel.component.google-sheets.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-sheets.autowiredEnabled": {
+			"name": "camel.component.google-sheets.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-sheets.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-source.json
index b5df53f..f1205d8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -235,11 +228,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-sheets.basicPropertyBinding": {
-			"name": "camel.component.google-sheets.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-sheets.autowiredEnabled": {
+			"name": "camel.component.google-sheets.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-sheets.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-stream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-stream-source.json
index 9d03966..6d5acdf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-stream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-stream-source.json
@@ -111,13 +111,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -313,11 +306,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-sheets-stream.basicPropertyBinding": {
-			"name": "camel.component.google-sheets-stream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-sheets-stream.autowiredEnabled": {
+			"name": "camel.component.google-sheets-stream.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-sheets-stream.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-sink.json
index dddd783..eae6149 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.hadoopConfiguration": {
 			"name": "camel.sink.endpoint.hadoopConfiguration",
 			"description": "Hadoop Configuration",
@@ -74,11 +67,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.gora.basicPropertyBinding": {
-			"name": "camel.component.gora.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.gora.autowiredEnabled": {
+			"name": "camel.component.gora.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-source.json
index 5142baf..e141292 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-source.json
@@ -125,13 +125,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.hadoopConfiguration": {
 			"name": "camel.source.endpoint.hadoopConfiguration",
 			"description": "Hadoop Configuration",
@@ -152,11 +145,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.gora.basicPropertyBinding": {
-			"name": "camel.component.gora.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.gora.autowiredEnabled": {
+			"name": "camel.component.gora.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grape-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grape-sink.json
index 0170d8f..08c8e22 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grape-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grape-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.grape.basicPropertyBinding": {
-			"name": "camel.component.grape.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.grape.autowiredEnabled": {
+			"name": "camel.component.grape.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.grape.patchesRepository": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-graphql-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-graphql-sink.json
index 87fa1a9..e44f0f1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-graphql-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-graphql-sink.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -72,6 +65,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.jwtAuthorizationType": {
+			"name": "camel.sink.endpoint.jwtAuthorizationType",
+			"description": "The JWT Authorization type. Default is Bearer.",
+			"defaultValue": "\"Bearer\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.password": {
 			"name": "camel.sink.endpoint.password",
 			"description": "The password for Basic authentication.",
@@ -91,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.graphql.basicPropertyBinding": {
-			"name": "camel.component.graphql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.graphql.autowiredEnabled": {
+			"name": "camel.component.graphql.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json
index fac545a..f8c3cb4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json
@@ -80,13 +80,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -170,11 +163,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.grpc.basicPropertyBinding": {
-			"name": "camel.component.grpc.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.grpc.autowiredEnabled": {
+			"name": "camel.component.grpc.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json
index 7233809..802385e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json
@@ -102,13 +102,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -192,11 +185,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.grpc.basicPropertyBinding": {
-			"name": "camel.component.grpc.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.grpc.autowiredEnabled": {
+			"name": "camel.component.grpc.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-sink.json
index 55d4734..6d4d482 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.guava-eventbus.basicPropertyBinding": {
-			"name": "camel.component.guava-eventbus.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.guava-eventbus.autowiredEnabled": {
+			"name": "camel.component.guava-eventbus.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-source.json
index a59ada0..ce7f82c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-source.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -79,11 +72,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.guava-eventbus.basicPropertyBinding": {
-			"name": "camel.component.guava-eventbus.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.guava-eventbus.autowiredEnabled": {
+			"name": "camel.component.guava-eventbus.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-atomicvalue-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-atomicvalue-sink.json
index e9865bf..0bd60cb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-atomicvalue-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-atomicvalue-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-atomicvalue.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-atomicvalue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-atomicvalue.autowiredEnabled": {
+			"name": "camel.component.hazelcast-atomicvalue.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-atomicvalue.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-instance-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-instance-source.json
index d50d21f..600d88b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-instance-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-instance-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-instance.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-instance.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-instance.autowiredEnabled": {
+			"name": "camel.component.hazelcast-instance.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-instance.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-sink.json
index ae12cbd..948c18f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-list.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-list.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-list.autowiredEnabled": {
+			"name": "camel.component.hazelcast-list.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-list.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-source.json
index 1d4d217..faf207d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-list.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-list.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-list.autowiredEnabled": {
+			"name": "camel.component.hazelcast-list.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-list.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-sink.json
index 2ae965e..94bed19 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-map.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-map.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-map.autowiredEnabled": {
+			"name": "camel.component.hazelcast-map.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-map.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-source.json
index 3081304..8b41497 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-map.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-map.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-map.autowiredEnabled": {
+			"name": "camel.component.hazelcast-map.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-map.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-sink.json
index 487cde4..1fd6b63 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-multimap.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-multimap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-multimap.autowiredEnabled": {
+			"name": "camel.component.hazelcast-multimap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-multimap.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-source.json
index 84aa80f..c59682e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-multimap.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-multimap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-multimap.autowiredEnabled": {
+			"name": "camel.component.hazelcast-multimap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-multimap.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-sink.json
index 58ff367..6978375 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-queue.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-queue.autowiredEnabled": {
+			"name": "camel.component.hazelcast-queue.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-queue.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-source.json
index ba51ed8..5fc319b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-source.json
@@ -73,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-queue.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-queue.autowiredEnabled": {
+			"name": "camel.component.hazelcast-queue.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-queue.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-sink.json
index a416e13..a0cdaf4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-replicatedmap.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-replicatedmap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-replicatedmap.autowiredEnabled": {
+			"name": "camel.component.hazelcast-replicatedmap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-replicatedmap.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-source.json
index 39e097f..eaf7d48 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-replicatedmap.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-replicatedmap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-replicatedmap.autowiredEnabled": {
+			"name": "camel.component.hazelcast-replicatedmap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-replicatedmap.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-ringbuffer-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-ringbuffer-sink.json
index 1027c9c..d361990 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-ringbuffer-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-ringbuffer-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-ringbuffer.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-ringbuffer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-ringbuffer.autowiredEnabled": {
+			"name": "camel.component.hazelcast-ringbuffer.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-ringbuffer.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-sink.json
index c8bad4f..91711b8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -96,11 +89,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-seda.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-seda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-seda.autowiredEnabled": {
+			"name": "camel.component.hazelcast-seda.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-seda.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-source.json
index 84cd305..aec6092 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -108,11 +101,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-seda.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-seda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-seda.autowiredEnabled": {
+			"name": "camel.component.hazelcast-seda.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-seda.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-sink.json
index 4c78e3b..a88fb39 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-set.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-set.autowiredEnabled": {
+			"name": "camel.component.hazelcast-set.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-set.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-source.json
index bcbb11e..9430425 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-set.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-set.autowiredEnabled": {
+			"name": "camel.component.hazelcast-set.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-set.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-sink.json
index e108ff4..73ec949 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -68,11 +61,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-topic.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-topic.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-topic.autowiredEnabled": {
+			"name": "camel.component.hazelcast-topic.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-topic.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-source.json
index b814031..b360de1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-source.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -80,11 +73,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-topic.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-topic.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-topic.autowiredEnabled": {
+			"name": "camel.component.hazelcast-topic.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-topic.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-sink.json
index bd70314..e68610a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-sink.json
@@ -71,13 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -99,11 +92,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hbase.basicPropertyBinding": {
-			"name": "camel.component.hbase.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hbase.autowiredEnabled": {
+			"name": "camel.component.hbase.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hbase.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-source.json
index c8b0b52..ac63208 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-source.json
@@ -101,13 +101,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hbase.basicPropertyBinding": {
-			"name": "camel.component.hbase.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hbase.autowiredEnabled": {
+			"name": "camel.component.hbase.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hbase.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-sink.json
index 7faafd1..65d3bb2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.blockSize": {
 			"name": "camel.sink.endpoint.blockSize",
 			"description": "The size of the HDFS blocks",
@@ -204,11 +197,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hdfs.basicPropertyBinding": {
-			"name": "camel.component.hdfs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hdfs.autowiredEnabled": {
+			"name": "camel.component.hdfs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hdfs.jAASConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-source.json
index e309032..68e3a85 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-source.json
@@ -121,13 +121,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.blockSize": {
 			"name": "camel.source.endpoint.blockSize",
 			"description": "The size of the HDFS blocks",
@@ -329,11 +322,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hdfs.basicPropertyBinding": {
-			"name": "camel.component.hdfs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hdfs.autowiredEnabled": {
+			"name": "camel.component.hdfs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hdfs.jAASConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json
index c2e1cbc..dd450ae 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json
@@ -149,13 +149,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientBuilder": {
 			"name": "camel.sink.endpoint.clientBuilder",
 			"description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.",
@@ -376,11 +369,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.http.basicPropertyBinding": {
-			"name": "camel.component.http.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.http.autowiredEnabled": {
+			"name": "camel.component.http.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.http.clientConnectionManager": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
index d39661a..5b251c7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
@@ -149,13 +149,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientBuilder": {
 			"name": "camel.sink.endpoint.clientBuilder",
 			"description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.",
@@ -376,11 +369,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.https.basicPropertyBinding": {
-			"name": "camel.component.https.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.https.autowiredEnabled": {
+			"name": "camel.component.https.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.https.clientConnectionManager": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-sink.json
index 11b6db2..164f695 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -154,11 +147,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.iec60870-client.basicPropertyBinding": {
-			"name": "camel.component.iec60870-client.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.iec60870-client.autowiredEnabled": {
+			"name": "camel.component.iec60870-client.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-source.json
index 81dd9d1..6e3ab9c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-source.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -166,11 +159,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.iec60870-client.basicPropertyBinding": {
-			"name": "camel.component.iec60870-client.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.iec60870-client.autowiredEnabled": {
+			"name": "camel.component.iec60870-client.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-sink.json
index 62c81b2..2b0a836 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-sink.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.iec60870-server.basicPropertyBinding": {
-			"name": "camel.component.iec60870-server.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.iec60870-server.autowiredEnabled": {
+			"name": "camel.component.iec60870-server.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-source.json
index 0897485..c099a05 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-source.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -173,11 +166,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.iec60870-server.basicPropertyBinding": {
-			"name": "camel.component.iec60870-server.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.iec60870-server.autowiredEnabled": {
+			"name": "camel.component.iec60870-server.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-sink.json
index 1aa0400..85738f7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-sink.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -101,11 +94,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-cache.basicPropertyBinding": {
-			"name": "camel.component.ignite-cache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-cache.autowiredEnabled": {
+			"name": "camel.component.ignite-cache.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-source.json
index 9f18510..daab3ca 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -134,11 +127,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-cache.basicPropertyBinding": {
-			"name": "camel.component.ignite-cache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-cache.autowiredEnabled": {
+			"name": "camel.component.ignite-cache.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-compute-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-compute-sink.json
index bbecf6a..e22c925 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-compute-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-compute-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -105,11 +98,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-compute.basicPropertyBinding": {
-			"name": "camel.component.ignite-compute.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-compute.autowiredEnabled": {
+			"name": "camel.component.ignite-compute.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-events-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-events-source.json
index 647cda7..d05d14a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-events-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-events-source.json
@@ -61,13 +61,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -100,11 +93,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-events.basicPropertyBinding": {
-			"name": "camel.component.ignite-events.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-events.autowiredEnabled": {
+			"name": "camel.component.ignite-events.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-idgen-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-idgen-sink.json
index 64556ed..3de037f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-idgen-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-idgen-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-idgen.basicPropertyBinding": {
-			"name": "camel.component.ignite-idgen.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-idgen.autowiredEnabled": {
+			"name": "camel.component.ignite-idgen.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-sink.json
index 518df40..cdb2844 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-messaging.basicPropertyBinding": {
-			"name": "camel.component.ignite-messaging.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-messaging.autowiredEnabled": {
+			"name": "camel.component.ignite-messaging.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-source.json
index 3e3ac11..99db795 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-source.json
@@ -54,13 +54,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -93,11 +86,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-messaging.basicPropertyBinding": {
-			"name": "camel.component.ignite-messaging.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-messaging.autowiredEnabled": {
+			"name": "camel.component.ignite-messaging.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-queue-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-queue-sink.json
index 07ac670..2009bf9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-queue-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-queue-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -99,11 +92,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-queue.basicPropertyBinding": {
-			"name": "camel.component.ignite-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-queue.autowiredEnabled": {
+			"name": "camel.component.ignite-queue.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-set-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-set-sink.json
index a5df7f6..127331f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-set-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-set-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -87,11 +80,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-set.basicPropertyBinding": {
-			"name": "camel.component.ignite-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-set.autowiredEnabled": {
+			"name": "camel.component.ignite-set.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-sink.json
index 4eee86f..3312240 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -275,11 +268,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.imap.basicPropertyBinding": {
-			"name": "camel.component.imap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.imap.autowiredEnabled": {
+			"name": "camel.component.imap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.imap.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-source.json
index 191b48d..3e91ea3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-source.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -528,11 +521,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.imap.basicPropertyBinding": {
-			"name": "camel.component.imap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.imap.autowiredEnabled": {
+			"name": "camel.component.imap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.imap.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-sink.json
index e40ad78..3eb2fbd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -275,11 +268,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.imaps.basicPropertyBinding": {
-			"name": "camel.component.imaps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.imaps.autowiredEnabled": {
+			"name": "camel.component.imaps.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.imaps.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-source.json
index 03f860a..2bc6f2e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-source.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -528,11 +521,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.imaps.basicPropertyBinding": {
-			"name": "camel.component.imaps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.imaps.autowiredEnabled": {
+			"name": "camel.component.imaps.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.imaps.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-infinispan-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-infinispan-sink.json
index 7279674..6a05c73 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-infinispan-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-infinispan-sink.json
@@ -102,13 +102,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.cacheContainer": {
 			"name": "camel.sink.endpoint.cacheContainer",
 			"description": "Specifies the cache Container to connect",
@@ -251,11 +244,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.infinispan.basicPropertyBinding": {
-			"name": "camel.component.infinispan.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.infinispan.autowiredEnabled": {
... 1050 lines suppressed ...


[camel-kafka-connector] 06/21: Catalog tests fixed

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 8271de5c94c111385009c71ffcdfed99c55885d1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Nov 13 06:37:25 2020 +0100

    Catalog tests fixed
---
 .../kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 49a1295..540904a 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -58,7 +58,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector", model.getGroupId());
         assertEquals("sink", model.getType());
         assertEquals("org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SinkConnector", model.getConnectorClass());
-        assertEquals(61, model.getOptions().size());
+        assertEquals(60, model.getOptions().size());
         assertEquals("camel.sink.path.bucketNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonS3Client", model.getOptions().get(1).getName());
         assertEquals("camel.sink.endpoint.autoCreateBucket", model.getOptions().get(2).getName());
@@ -74,7 +74,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector", model.getGroupId());
         assertEquals("sink", model.getType());
         assertEquals("org.apache.camel.kafkaconnector.aws2sns.CamelAws2snsSinkConnector", model.getConnectorClass());
-        assertEquals(44, model.getOptions().size());
+        assertEquals(43, model.getOptions().size());
         assertEquals("camel.sink.path.topicNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonSNSClient", model.getOptions().get(1).getName());
         assertEquals("camel.sink.endpoint.autoCreateTopic", model.getOptions().get(2).getName());
@@ -92,7 +92,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector", model.getGroupId());
         assertEquals("source", model.getType());
         assertEquals("org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSourceConnector", model.getConnectorClass());
-        assertEquals(42, model.getOptions().size());
+        assertEquals(41, model.getOptions().size());
         assertEquals("camel.source.path.protocol", model.getOptions().get(0).getName());
         assertNull(model.getOptions().get(0).getDefaultValue());
         assertNull(model.getConverters());


[camel-kafka-connector] 20/21: Fixed catalog test with JDK11

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit fcb85ca74ee5ff01417901bb88f56d11ed66d4b9
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 24 08:15:38 2020 +0100

    Fixed catalog test with JDK11
---
 .../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 9b381c5..7316923 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -60,7 +60,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SinkConnector", model.getConnectorClass());
         assertEquals("camel.sink.path.bucketNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonS3Client", model.getOptions().get(1).getName());
-        assertEquals("camel.sink.endpoint.autoCreateBucket", model.getOptions().get(2).getName());
+        assertEquals("camel.sink.endpoint.amazonS3Presigner", model.getOptions().get(2).getName());
         assertEquals(1, model.getConverters().size());
         assertEquals(1, model.getTransforms().size());
         assertNull(model.getAggregationStrategies());


[camel-kafka-connector] 09/21: Fixed incorrect formatting of Bucket URL in Couchbase tests

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 48707ef723898f0278f1a80e89f0ee5d6925fa17
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Mon Nov 16 10:00:21 2020 +0100

    Fixed incorrect formatting of Bucket URL in Couchbase tests
---
 .../kafkaconnector/couchbase/sink/CamelCouchbasePropertyFactory.java  | 4 ++--
 .../camel/kafkaconnector/couchbase/sink/CamelSinkCouchbaseITCase.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/itests-couchbase/src/test/java/org/apache/camel/kafkaconnector/couchbase/sink/CamelCouchbasePropertyFactory.java b/tests/itests-couchbase/src/test/java/org/apache/camel/kafkaconnector/couchbase/sink/CamelCouchbasePropertyFactory.java
index dd0e9d9..64d66aa 100644
--- a/tests/itests-couchbase/src/test/java/org/apache/camel/kafkaconnector/couchbase/sink/CamelCouchbasePropertyFactory.java
+++ b/tests/itests-couchbase/src/test/java/org/apache/camel/kafkaconnector/couchbase/sink/CamelCouchbasePropertyFactory.java
@@ -54,8 +54,8 @@ public class CamelCouchbasePropertyFactory extends SinkConnectorPropertyFactory<
         return setProperty("camel.sink.endpoint.password", value);
     }
 
-    public EndpointUrlBuilder<CamelCouchbasePropertyFactory> withUrl(String protocol, String hostname, int port, String bucket) {
-        String sinkUrl = String.format("couchbase:%s://%s:%d/%s", protocol, hostname, port, bucket);
+    public EndpointUrlBuilder<CamelCouchbasePropertyFactory> withUrl(String protocol, String hostname, int port) {
+        String sinkUrl = String.format("couchbase:%s://%s:%d", protocol, hostname, port);
 
         return new EndpointUrlBuilder<>(this::withSinkUrl, sinkUrl);
     }
diff --git a/tests/itests-couchbase/src/test/java/org/apache/camel/kafkaconnector/couchbase/sink/CamelSinkCouchbaseITCase.java b/tests/itests-couchbase/src/test/java/org/apache/camel/kafkaconnector/couchbase/sink/CamelSinkCouchbaseITCase.java
index 6c75920..a37b50d 100644
--- a/tests/itests-couchbase/src/test/java/org/apache/camel/kafkaconnector/couchbase/sink/CamelSinkCouchbaseITCase.java
+++ b/tests/itests-couchbase/src/test/java/org/apache/camel/kafkaconnector/couchbase/sink/CamelSinkCouchbaseITCase.java
@@ -184,13 +184,13 @@ public class CamelSinkCouchbaseITCase extends AbstractKafkaTest {
         runTest(factory);
     }
 
-    @Disabled("Due to CAMEL-15789")
     @Test
     @Timeout(90)
     public void testBasicSendReceiveUsingUrl() throws Exception {
         ConnectorPropertyFactory factory = CamelCouchbasePropertyFactory.basic()
                 .withTopics(topic)
-                .withUrl("http", service.getHostname(), service.getPort(), bucketName)
+                .withUrl("http", service.getHostname(), service.getPort())
+                    .append("bucket", bucketName)
                     .append("username", service.getUsername())
                     .append("password", service.getPassword())
                     .buildUrl();


[camel-kafka-connector] 12/21: File language and core languages in general are not working

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 2ac661ce78ce32436a0eecc316ae1ffe7521668b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 19 10:34:43 2020 +0100

    File language and core languages in general are not working
---
 .../src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java
index 0251d66..9b597c3 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/TaskHelper.java
@@ -65,7 +65,7 @@ public final class TaskHelper {
 
 
 
-        return factory.buildUri(componentSchema, filteredProps);
+        return factory.buildUri(componentSchema, filteredProps, false);
     }
 
     /**


[camel-kafka-connector] 16/21: Fixed CamelKafkaConnectorCatalogTest

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 67302bdb202eab150ebe25e043aaec8d6e569b24
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 23 09:02:52 2020 +0100

    Fixed CamelKafkaConnectorCatalogTest
---
 .../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 9b381c5..7316923 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -60,7 +60,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SinkConnector", model.getConnectorClass());
         assertEquals("camel.sink.path.bucketNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonS3Client", model.getOptions().get(1).getName());
-        assertEquals("camel.sink.endpoint.autoCreateBucket", model.getOptions().get(2).getName());
+        assertEquals("camel.sink.endpoint.amazonS3Presigner", model.getOptions().get(2).getName());
         assertEquals(1, model.getConverters().size());
         assertEquals(1, model.getTransforms().size());
         assertNull(model.getAggregationStrategies());


[camel-kafka-connector] 10/21: Fix couchbase catalog test

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 610da5337b3d2cdc2ebcdcfdebccd8527b921b6d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Nov 18 07:21:54 2020 +0100

    Fix couchbase catalog test
---
 .../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index dab7b56..5f909c5 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -92,7 +92,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector", model.getGroupId());
         assertEquals("source", model.getType());
         assertEquals("org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSourceConnector", model.getConnectorClass());
-        assertEquals(41, model.getOptions().size());
+        assertEquals(43, model.getOptions().size());
         assertEquals("camel.source.path.protocol", model.getOptions().get(0).getName());
         assertNull(model.getOptions().get(0).getDefaultValue());
         assertNull(model.getConverters());


[camel-kafka-connector] 08/21: Aligned camel-master tests with fix

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 620bb5815a6d08402cb1fc83895a43fec724ae7b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 16 07:05:28 2020 +0100

    Aligned camel-master tests with fix
---
 .../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 540904a..dab7b56 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -58,7 +58,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector", model.getGroupId());
         assertEquals("sink", model.getType());
         assertEquals("org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SinkConnector", model.getConnectorClass());
-        assertEquals(60, model.getOptions().size());
+        assertEquals(58, model.getOptions().size());
         assertEquals("camel.sink.path.bucketNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonS3Client", model.getOptions().get(1).getName());
         assertEquals("camel.sink.endpoint.autoCreateBucket", model.getOptions().get(2).getName());


[camel-kafka-connector] 07/21: Adjust the emdedded Kafka service to the updated interface from Camel 3.7

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit fc53d5a10c7bd7ec88cbbdc706b4a75051838ded
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Fri Nov 13 14:03:06 2020 +0100

    Adjust the emdedded Kafka service to the updated interface from Camel 3.7
---
 .../kafkaconnector/common/services/kafka/EmbeddedKafkaService.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java
index caffbf1..4f3ec89 100644
--- a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java
+++ b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java
@@ -79,11 +79,17 @@ public class EmbeddedKafkaService implements KafkaService {
     }
 
     @Override
+    public void registerProperties() {
+        // NO-OP
+    }
+
+    @Override
     public void initialize() {
         if (!started) {
             cluster.start();
             started = true;
 
+            registerProperties();
             LOG.info("Kafka bootstrap server running at address {}", getBootstrapServers());
         }
     }


[camel-kafka-connector] 02/21: Temporarily disable a test affected by CAMEL-15789

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 700047d1fae6f56955558ae4da94424e640fc766
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Fri Nov 6 10:57:46 2020 +0100

    Temporarily disable a test affected by CAMEL-15789
---
 .../camel/kafkaconnector/couchbase/sink/CamelSinkCouchbaseITCase.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/itests-couchbase/src/test/java/org/apache/camel/kafkaconnector/couchbase/sink/CamelSinkCouchbaseITCase.java b/tests/itests-couchbase/src/test/java/org/apache/camel/kafkaconnector/couchbase/sink/CamelSinkCouchbaseITCase.java
index fd51530..6c75920 100644
--- a/tests/itests-couchbase/src/test/java/org/apache/camel/kafkaconnector/couchbase/sink/CamelSinkCouchbaseITCase.java
+++ b/tests/itests-couchbase/src/test/java/org/apache/camel/kafkaconnector/couchbase/sink/CamelSinkCouchbaseITCase.java
@@ -184,6 +184,7 @@ public class CamelSinkCouchbaseITCase extends AbstractKafkaTest {
         runTest(factory);
     }
 
+    @Disabled("Due to CAMEL-15789")
     @Test
     @Timeout(90)
     public void testBasicSendReceiveUsingUrl() throws Exception {


[camel-kafka-connector] 01/21: Point to 3.7.0-SNAPSHOT

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit d4a5131165c940c398ad348e2af82a04c1e98ef6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Oct 26 15:52:50 2020 +0100

    Point to 3.7.0-SNAPSHOT
---
 parent/pom.xml | 2 +-
 pom.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 247898e..1699380 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <kafka.version>2.6.0</kafka.version>
-        <camel.version>3.6.0</camel.version>
+        <camel.version>3.7.0-SNAPSHOT</camel.version>
         <apicurio.registry.version>1.3.1.Final</apicurio.registry.version>
         <resteasy.version>4.5.6.Final</resteasy.version>
         <version.java>1.8</version.java>
diff --git a/pom.xml b/pom.xml
index 7a44882..8d17c87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dependencies</artifactId>
-        <version>3.6.0</version>
+        <version>3.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel.kafkaconnector</groupId>


[camel-kafka-connector] 18/21: Fixed Test and regen

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 669d726616ae617ac035ff71086601a9cba71d51
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 24 07:34:22 2020 +0100

    Fixed Test and regen
---
 .../resources/connectors/camel-jooq-sink.json      | 17 ++++---------
 .../resources/connectors/camel-jooq-source.json    | 17 ++++---------
 .../resources/connectors/camel-jpa-sink.json       | 17 ++++---------
 .../resources/connectors/camel-jpa-source.json     | 17 ++++---------
 .../resources/connectors/camel-jslt-sink.json      | 17 ++++---------
 .../connectors/camel-json-validator-sink.json      | 17 ++++---------
 .../resources/connectors/camel-jsonata-sink.json   | 17 ++++---------
 .../resources/connectors/camel-jt400-sink.json     | 17 ++++---------
 .../resources/connectors/camel-jt400-source.json   | 17 ++++---------
 .../resources/connectors/camel-kafka-sink.json     | 17 ++++---------
 .../resources/connectors/camel-kafka-source.json   | 17 ++++---------
 .../camel-kubernetes-config-maps-sink.json         | 17 ++++---------
 .../camel-kubernetes-custom-resources-sink.json    | 19 +++++---------
 .../camel-kubernetes-custom-resources-source.json  | 19 +++++---------
 .../camel-kubernetes-deployments-sink.json         | 17 ++++---------
 .../camel-kubernetes-deployments-source.json       | 17 ++++---------
 .../connectors/camel-kubernetes-hpa-sink.json      | 17 ++++---------
 .../connectors/camel-kubernetes-hpa-source.json    | 17 ++++---------
 .../connectors/camel-kubernetes-job-sink.json      | 17 ++++---------
 .../connectors/camel-kubernetes-job-source.json    | 17 ++++---------
 .../camel-kubernetes-namespaces-sink.json          | 17 ++++---------
 .../camel-kubernetes-namespaces-source.json        | 17 ++++---------
 .../connectors/camel-kubernetes-nodes-sink.json    | 17 ++++---------
 .../connectors/camel-kubernetes-nodes-source.json  | 17 ++++---------
 ...-kubernetes-persistent-volumes-claims-sink.json | 17 ++++---------
 .../camel-kubernetes-persistent-volumes-sink.json  | 17 ++++---------
 .../connectors/camel-kubernetes-pods-sink.json     | 17 ++++---------
 .../connectors/camel-kubernetes-pods-source.json   | 17 ++++---------
 ...el-kubernetes-replication-controllers-sink.json | 17 ++++---------
 ...-kubernetes-replication-controllers-source.json | 17 ++++---------
 .../camel-kubernetes-resources-quota-sink.json     | 17 ++++---------
 .../connectors/camel-kubernetes-secrets-sink.json  | 17 ++++---------
 .../camel-kubernetes-service-accounts-sink.json    | 17 ++++---------
 .../connectors/camel-kubernetes-services-sink.json | 17 ++++---------
 .../camel-kubernetes-services-source.json          | 17 ++++---------
 .../resources/connectors/camel-kudu-sink.json      | 17 ++++---------
 .../resources/connectors/camel-language-sink.json  | 17 ++++---------
 .../resources/connectors/camel-ldap-sink.json      | 17 ++++---------
 .../resources/connectors/camel-ldif-sink.json      | 17 ++++---------
 .../resources/connectors/camel-log-sink.json       | 17 ++++---------
 .../resources/connectors/camel-lpr-sink.json       | 17 ++++---------
 .../resources/connectors/camel-lucene-sink.json    | 17 ++++---------
 .../connectors/camel-lumberjack-source.json        | 17 ++++---------
 .../resources/connectors/camel-master-source.json  | 17 ++++---------
 .../resources/connectors/camel-metrics-sink.json   | 17 ++++---------
 .../connectors/camel-micrometer-sink.json          | 17 ++++---------
 .../camel-microprofile-metrics-sink.json           | 17 ++++---------
 .../connectors/camel-milo-client-sink.json         | 17 ++++---------
 .../connectors/camel-milo-client-source.json       | 17 ++++---------
 .../connectors/camel-milo-server-sink.json         | 17 ++++---------
 .../connectors/camel-milo-server-source.json       | 17 ++++---------
 .../resources/connectors/camel-mina-sink.json      | 17 ++++---------
 .../resources/connectors/camel-mina-source.json    | 17 ++++---------
 .../resources/connectors/camel-minio-sink.json     | 17 ++++---------
 .../resources/connectors/camel-minio-source.json   | 17 ++++---------
 .../resources/connectors/camel-mllp-sink.json      | 17 ++++---------
 .../resources/connectors/camel-mllp-source.json    | 17 ++++---------
 .../connectors/camel-mongodb-gridfs-sink.json      | 17 ++++---------
 .../connectors/camel-mongodb-gridfs-source.json    | 17 ++++---------
 .../resources/connectors/camel-mongodb-sink.json   | 17 ++++---------
 .../resources/connectors/camel-mongodb-source.json | 17 ++++---------
 .../resources/connectors/camel-msv-sink.json       | 17 ++++---------
 .../resources/connectors/camel-mustache-sink.json  | 17 ++++---------
 .../resources/connectors/camel-mvel-sink.json      | 17 ++++---------
 .../connectors/camel-mybatis-bean-sink.json        | 17 ++++---------
 .../resources/connectors/camel-mybatis-sink.json   | 17 ++++---------
 .../resources/connectors/camel-mybatis-source.json | 17 ++++---------
 .../resources/connectors/camel-nagios-sink.json    | 17 ++++---------
 .../resources/connectors/camel-nats-sink.json      | 24 +++++++++---------
 .../resources/connectors/camel-nats-source.json    | 24 +++++++++---------
 .../connectors/camel-netty-http-sink.json          | 17 ++++---------
 .../connectors/camel-netty-http-source.json        | 17 ++++---------
 .../resources/connectors/camel-nitrite-sink.json   | 17 ++++---------
 .../resources/connectors/camel-nitrite-source.json | 17 ++++---------
 .../resources/connectors/camel-nsq-sink.json       | 17 ++++---------
 .../resources/connectors/camel-nsq-source.json     | 17 ++++---------
 .../resources/connectors/camel-oaipmh-sink.json    | 17 ++++---------
 .../resources/connectors/camel-oaipmh-source.json  | 17 ++++---------
 .../resources/connectors/camel-olingo2-sink.json   | 17 ++++---------
 .../resources/connectors/camel-olingo2-source.json | 17 ++++---------
 .../resources/connectors/camel-olingo4-sink.json   | 17 ++++---------
 .../resources/connectors/camel-olingo4-source.json | 17 ++++---------
 .../camel-openshift-build-configs-sink.json        | 17 ++++---------
 .../connectors/camel-openshift-builds-sink.json    | 17 ++++---------
 .../connectors/camel-openstack-cinder-sink.json    | 17 ++++---------
 .../connectors/camel-openstack-glance-sink.json    | 17 ++++---------
 .../connectors/camel-openstack-keystone-sink.json  | 17 ++++---------
 .../connectors/camel-openstack-neutron-sink.json   | 17 ++++---------
 .../connectors/camel-openstack-nova-sink.json      | 17 ++++---------
 .../connectors/camel-openstack-swift-sink.json     | 17 ++++---------
 .../connectors/camel-optaplanner-sink.json         | 17 ++++---------
 .../connectors/camel-optaplanner-source.json       | 17 ++++---------
 .../resources/connectors/camel-paho-sink.json      | 17 ++++---------
 .../resources/connectors/camel-paho-source.json    | 17 ++++---------
 .../resources/connectors/camel-pdf-sink.json       | 17 ++++---------
 .../camel-pg-replication-slot-source.json          | 17 ++++---------
 .../resources/connectors/camel-pgevent-sink.json   | 17 ++++---------
 .../resources/connectors/camel-pgevent-source.json | 17 ++++---------
 .../connectors/camel-platform-http-source.json     | 17 ++++---------
 .../resources/connectors/camel-pop3-sink.json      | 17 ++++---------
 .../resources/connectors/camel-pop3-source.json    | 17 ++++---------
 .../resources/connectors/camel-pop3s-sink.json     | 17 ++++---------
 .../resources/connectors/camel-pop3s-source.json   | 17 ++++---------
 .../resources/connectors/camel-pubnub-sink.json    | 17 ++++---------
 .../resources/connectors/camel-pubnub-source.json  | 17 ++++---------
 .../resources/connectors/camel-pulsar-sink.json    | 17 ++++---------
 .../resources/connectors/camel-pulsar-source.json  | 17 ++++---------
 .../resources/connectors/camel-quartz-source.json  | 17 ++++---------
 .../resources/connectors/camel-quickfix-sink.json  | 17 ++++---------
 .../connectors/camel-quickfix-source.json          | 17 ++++---------
 .../resources/connectors/camel-rabbitmq-sink.json  | 17 ++++---------
 .../connectors/camel-rabbitmq-source.json          | 17 ++++---------
 .../connectors/camel-reactive-streams-sink.json    | 17 ++++---------
 .../connectors/camel-reactive-streams-source.json  | 17 ++++---------
 .../connectors/camel-rest-api-source.json          | 17 ++++---------
 .../connectors/camel-rest-openapi-sink.json        | 17 ++++---------
 .../resources/connectors/camel-rest-sink.json      | 17 ++++---------
 .../resources/connectors/camel-rest-source.json    | 17 ++++---------
 .../connectors/camel-rest-swagger-sink.json        | 17 ++++---------
 .../resources/connectors/camel-resteasy-sink.json  | 17 ++++---------
 .../connectors/camel-resteasy-source.json          | 17 ++++---------
 .../resources/connectors/camel-rss-source.json     | 17 ++++---------
 .../resources/connectors/camel-saga-sink.json      | 17 ++++---------
 .../connectors/camel-salesforce-sink.json          | 21 ++++++----------
 .../connectors/camel-salesforce-source.json        | 21 ++++++----------
 .../connectors/camel-sap-netweaver-sink.json       | 17 ++++---------
 .../connectors/camel-scheduler-source.json         | 17 ++++---------
 .../connectors/camel-schematron-sink.json          | 17 ++++---------
 .../resources/connectors/camel-scp-sink.json       | 17 ++++---------
 .../resources/connectors/camel-seda-sink.json      | 17 ++++---------
 .../resources/connectors/camel-seda-source.json    | 17 ++++---------
 .../resources/connectors/camel-service-source.json | 17 ++++---------
 .../connectors/camel-servicenow-sink.json          | 17 ++++---------
 .../resources/connectors/camel-servlet-source.json | 17 ++++---------
 .../resources/connectors/camel-sftp-sink.json      | 17 ++++---------
 .../resources/connectors/camel-sftp-source.json    | 17 ++++---------
 .../resources/connectors/camel-sip-sink.json       | 17 ++++---------
 .../resources/connectors/camel-sip-source.json     | 17 ++++---------
 .../resources/connectors/camel-sips-sink.json      | 17 ++++---------
 .../resources/connectors/camel-sips-source.json    | 17 ++++---------
 .../connectors/camel-sjms-batch-source.json        | 17 ++++---------
 .../resources/connectors/camel-sjms-sink.json      | 29 ++++++++--------------
 .../resources/connectors/camel-sjms-source.json    | 29 ++++++++--------------
 .../resources/connectors/camel-sjms2-sink.json     | 29 ++++++++--------------
 .../resources/connectors/camel-sjms2-source.json   | 29 ++++++++--------------
 .../resources/connectors/camel-slack-sink.json     | 17 ++++---------
 .../resources/connectors/camel-slack-source.json   | 17 ++++---------
 .../resources/connectors/camel-smpp-sink.json      | 17 ++++---------
 .../resources/connectors/camel-smpp-source.json    | 17 ++++---------
 .../resources/connectors/camel-smpps-sink.json     | 17 ++++---------
 .../resources/connectors/camel-smpps-source.json   | 17 ++++---------
 .../resources/connectors/camel-smtp-sink.json      | 17 ++++---------
 .../resources/connectors/camel-smtp-source.json    | 17 ++++---------
 .../resources/connectors/camel-smtps-sink.json     | 17 ++++---------
 .../resources/connectors/camel-smtps-source.json   | 17 ++++---------
 .../resources/connectors/camel-snmp-sink.json      | 17 ++++---------
 .../resources/connectors/camel-snmp-source.json    | 17 ++++---------
 .../resources/connectors/camel-solr-sink.json      | 17 ++++---------
 .../resources/connectors/camel-solrCloud-sink.json | 17 ++++---------
 .../resources/connectors/camel-solrs-sink.json     | 17 ++++---------
 .../resources/connectors/camel-soroush-sink.json   | 17 ++++---------
 .../resources/connectors/camel-soroush-source.json | 17 ++++---------
 .../resources/connectors/camel-spark-sink.json     | 17 ++++---------
 .../connectors/camel-splunk-hec-sink.json          | 17 ++++---------
 .../resources/connectors/camel-splunk-sink.json    | 17 ++++---------
 .../resources/connectors/camel-splunk-source.json  | 17 ++++---------
 .../connectors/camel-spring-batch-sink.json        | 17 ++++---------
 .../connectors/camel-spring-event-sink.json        | 17 ++++---------
 .../connectors/camel-spring-event-source.json      | 17 ++++---------
 .../connectors/camel-spring-integration-sink.json  | 17 ++++---------
 .../camel-spring-integration-source.json           | 17 ++++---------
 .../connectors/camel-spring-ldap-sink.json         | 17 ++++---------
 .../connectors/camel-spring-redis-sink.json        | 17 ++++---------
 .../connectors/camel-spring-redis-source.json      | 17 ++++---------
 .../resources/connectors/camel-spring-ws-sink.json | 17 ++++---------
 .../connectors/camel-spring-ws-source.json         | 17 ++++---------
 .../resources/connectors/camel-sql-sink.json       | 17 ++++---------
 .../resources/connectors/camel-sql-source.json     | 17 ++++---------
 .../connectors/camel-sql-stored-sink.json          | 17 ++++---------
 .../resources/connectors/camel-ssh-sink.json       | 17 ++++---------
 .../resources/connectors/camel-ssh-source.json     | 17 ++++---------
 .../resources/connectors/camel-stax-sink.json      | 17 ++++---------
 .../resources/connectors/camel-stomp-sink.json     | 17 ++++---------
 .../resources/connectors/camel-stomp-source.json   | 17 ++++---------
 .../resources/connectors/camel-stream-sink.json    | 17 ++++---------
 .../resources/connectors/camel-stream-source.json  | 17 ++++---------
 .../connectors/camel-string-template-sink.json     | 17 ++++---------
 .../resources/connectors/camel-stub-sink.json      | 17 ++++---------
 .../resources/connectors/camel-stub-source.json    | 17 ++++---------
 .../resources/connectors/camel-telegram-sink.json  | 21 ++++++----------
 .../connectors/camel-telegram-source.json          | 21 ++++++----------
 .../resources/connectors/camel-thrift-sink.json    | 17 ++++---------
 .../resources/connectors/camel-thrift-source.json  | 17 ++++---------
 .../resources/connectors/camel-tika-sink.json      | 17 ++++---------
 .../resources/connectors/camel-timer-source.json   | 17 ++++---------
 .../resources/connectors/camel-twilio-sink.json    | 17 ++++---------
 .../resources/connectors/camel-twilio-source.json  | 17 ++++---------
 .../camel-twitter-directmessage-sink.json          | 17 ++++---------
 .../camel-twitter-directmessage-source.json        | 17 ++++---------
 .../connectors/camel-twitter-search-sink.json      | 17 ++++---------
 .../connectors/camel-twitter-search-source.json    | 17 ++++---------
 .../connectors/camel-twitter-timeline-sink.json    | 17 ++++---------
 .../connectors/camel-twitter-timeline-source.json  | 17 ++++---------
 .../resources/connectors/camel-undertow-sink.json  | 17 ++++---------
 .../connectors/camel-undertow-source.json          | 17 ++++---------
 .../resources/connectors/camel-validator-sink.json | 17 ++++---------
 .../resources/connectors/camel-velocity-sink.json  | 17 ++++---------
 .../connectors/camel-vertx-http-sink.json          | 17 ++++---------
 .../resources/connectors/camel-vertx-sink.json     | 17 ++++---------
 .../resources/connectors/camel-vertx-source.json   | 17 ++++---------
 .../connectors/camel-vertx-websocket-sink.json     | 17 ++++---------
 .../connectors/camel-vertx-websocket-source.json   | 17 ++++---------
 .../resources/connectors/camel-vm-sink.json        | 17 ++++---------
 .../resources/connectors/camel-vm-source.json      | 17 ++++---------
 .../resources/connectors/camel-weather-sink.json   | 17 ++++---------
 .../resources/connectors/camel-weather-source.json | 17 ++++---------
 .../resources/connectors/camel-web3j-sink.json     | 17 ++++---------
 .../resources/connectors/camel-web3j-source.json   | 17 ++++---------
 .../resources/connectors/camel-webhook-source.json | 17 ++++---------
 .../connectors/camel-websocket-jsr356-sink.json    | 17 ++++---------
 .../connectors/camel-websocket-jsr356-source.json  | 17 ++++---------
 .../resources/connectors/camel-websocket-sink.json | 17 ++++---------
 .../connectors/camel-websocket-source.json         | 17 ++++---------
 .../resources/connectors/camel-weka-sink.json      | 17 ++++---------
 .../resources/connectors/camel-wordpress-sink.json | 17 ++++---------
 .../connectors/camel-wordpress-source.json         | 17 ++++---------
 .../catalog/CamelKafkaConnectorCatalogTest.java    |  2 +-
 227 files changed, 1179 insertions(+), 2747 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-sink.json
index b0261fb..6f782e1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-sink.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -87,11 +80,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jooq.basicPropertyBinding": {
-			"name": "camel.component.jooq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jooq.autowiredEnabled": {
+			"name": "camel.component.jooq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-source.json
index 084c01d..424e1f8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-source.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -193,11 +186,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jooq.basicPropertyBinding": {
-			"name": "camel.component.jooq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jooq.autowiredEnabled": {
+			"name": "camel.component.jooq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-sink.json
index c7dedc4..c6b3189 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-sink.json
@@ -108,13 +108,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.entityManagerProperties": {
 			"name": "camel.sink.endpoint.entityManagerProperties",
 			"description": "Additional properties for the entity manager to use.",
@@ -168,11 +161,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jpa.basicPropertyBinding": {
-			"name": "camel.component.jpa.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jpa.autowiredEnabled": {
+			"name": "camel.component.jpa.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-source.json
index b848943..61df69e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-source.json
@@ -151,13 +151,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.entityManagerProperties": {
 			"name": "camel.source.endpoint.entityManagerProperties",
 			"description": "Additional properties for the entity manager to use.",
@@ -304,11 +297,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jpa.basicPropertyBinding": {
-			"name": "camel.component.jpa.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jpa.autowiredEnabled": {
+			"name": "camel.component.jpa.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jslt-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jslt-sink.json
index f0f5fb8..c62c706 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jslt-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jslt-sink.json
@@ -50,13 +50,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -78,11 +71,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jslt.basicPropertyBinding": {
-			"name": "camel.component.jslt.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jslt.autowiredEnabled": {
+			"name": "camel.component.jslt.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.jslt.functions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-json-validator-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-json-validator-sink.json
index 5458171..7a818f4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-json-validator-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-json-validator-sink.json
@@ -56,13 +56,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.errorHandler": {
 			"name": "camel.sink.endpoint.errorHandler",
 			"description": "To use a custom ValidatorErrorHandler. The default error handler captures the errors and throws an exception.",
@@ -89,11 +82,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.json-validator.basicPropertyBinding": {
-			"name": "camel.component.json-validator.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.json-validator.autowiredEnabled": {
+			"name": "camel.component.json-validator.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jsonata-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jsonata-sink.json
index 6fa3064..3eab12b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jsonata-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jsonata-sink.json
@@ -50,13 +50,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -71,11 +64,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jsonata.basicPropertyBinding": {
-			"name": "camel.component.jsonata.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jsonata.autowiredEnabled": {
+			"name": "camel.component.jsonata.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-sink.json
index 39577e8..2b68c4a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-sink.json
@@ -97,13 +97,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -125,11 +118,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jt400.basicPropertyBinding": {
-			"name": "camel.component.jt400.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jt400.autowiredEnabled": {
+			"name": "camel.component.jt400.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.jt400.connectionPool": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-source.json
index bda05c2..c1cb5f6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-source.json
@@ -125,13 +125,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -246,11 +239,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jt400.basicPropertyBinding": {
-			"name": "camel.component.jt400.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jt400.autowiredEnabled": {
+			"name": "camel.component.jt400.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.jt400.connectionPool": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json
index d5b3d67..49c966e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json
@@ -272,13 +272,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -717,11 +710,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.basicPropertyBinding": {
-			"name": "camel.component.kafka.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kafka.autowiredEnabled": {
+			"name": "camel.component.kafka.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.kafka.schemaRegistryURL": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
index d2d7b87..6f7d884 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
@@ -263,13 +263,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -663,11 +656,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.basicPropertyBinding": {
-			"name": "camel.component.kafka.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kafka.autowiredEnabled": {
+			"name": "camel.component.kafka.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.kafka.schemaRegistryURL": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-config-maps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-config-maps-sink.json
index 679dfc1..8ec19cf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-config-maps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-config-maps-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-config-maps.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-config-maps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-config-maps.autowiredEnabled": {
+			"name": "camel.component.kubernetes-config-maps.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-sink.json
index bff86b3..63bf1eb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,12 +151,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-custom-resources.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-custom-resources.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-custom-resources.autowiredEnabled": {
+			"name": "camel.component.kubernetes-custom-resources.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-source.json
index 740c5a2..7dd2386 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,12 +218,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-custom-resources.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-custom-resources.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-custom-resources.autowiredEnabled": {
+			"name": "camel.component.kubernetes-custom-resources.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-sink.json
index 478e170..9037422 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-deployments.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-deployments.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-deployments.autowiredEnabled": {
+			"name": "camel.component.kubernetes-deployments.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json
index bfb7af9..e5d0cba 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-deployments.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-deployments.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-deployments.autowiredEnabled": {
+			"name": "camel.component.kubernetes-deployments.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-sink.json
index 0a35e55..aca26fb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-hpa.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-hpa.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-hpa.autowiredEnabled": {
+			"name": "camel.component.kubernetes-hpa.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
index d88584c..0b1bb40 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-hpa.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-hpa.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-hpa.autowiredEnabled": {
+			"name": "camel.component.kubernetes-hpa.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-sink.json
index cf7ce33..0071d9f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-job.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-job.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-job.autowiredEnabled": {
+			"name": "camel.component.kubernetes-job.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json
index dcea34d..a95e1c0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-job.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-job.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-job.autowiredEnabled": {
+			"name": "camel.component.kubernetes-job.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-sink.json
index bf0a093..918a3b5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-namespaces.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-namespaces.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-namespaces.autowiredEnabled": {
+			"name": "camel.component.kubernetes-namespaces.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json
index a38bb65..98daffa 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-namespaces.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-namespaces.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-namespaces.autowiredEnabled": {
+			"name": "camel.component.kubernetes-namespaces.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-sink.json
index 96f4412..f50a547 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-nodes.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-nodes.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-nodes.autowiredEnabled": {
+			"name": "camel.component.kubernetes-nodes.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json
index 320bb79..75d4cf5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-nodes.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-nodes.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-nodes.autowiredEnabled": {
+			"name": "camel.component.kubernetes-nodes.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-claims-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-claims-sink.json
index a2dfaf3..b4aa612 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-claims-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-claims-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-persistent-volumes-claims.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-persistent-volumes-claims.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-persistent-volumes-claims.autowiredEnabled": {
+			"name": "camel.component.kubernetes-persistent-volumes-claims.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-sink.json
index fa13172..5af1a6d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-persistent-volumes.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-persistent-volumes.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-persistent-volumes.autowiredEnabled": {
+			"name": "camel.component.kubernetes-persistent-volumes.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-sink.json
index b72484f..ce6ae7a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-pods.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-pods.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-pods.autowiredEnabled": {
+			"name": "camel.component.kubernetes-pods.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json
index 1679e6e..e775a94 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-pods.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-pods.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-pods.autowiredEnabled": {
+			"name": "camel.component.kubernetes-pods.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-sink.json
index 47b9ad0..c04ecdd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-replication-controllers.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-replication-controllers.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-replication-controllers.autowiredEnabled": {
+			"name": "camel.component.kubernetes-replication-controllers.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json
index 693f9c0..a1ffb55 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-replication-controllers.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-replication-controllers.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-replication-controllers.autowiredEnabled": {
+			"name": "camel.component.kubernetes-replication-controllers.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-resources-quota-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-resources-quota-sink.json
index 3729af5..713f280 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-resources-quota-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-resources-quota-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-resources-quota.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-resources-quota.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-resources-quota.autowiredEnabled": {
+			"name": "camel.component.kubernetes-resources-quota.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-secrets-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-secrets-sink.json
index 61bbb09..741af8e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-secrets-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-secrets-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-secrets.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-secrets.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-secrets.autowiredEnabled": {
+			"name": "camel.component.kubernetes-secrets.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-service-accounts-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-service-accounts-sink.json
index 68fa9a4..c0d8524 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-service-accounts-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-service-accounts-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-service-accounts.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-service-accounts.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-service-accounts.autowiredEnabled": {
+			"name": "camel.component.kubernetes-service-accounts.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-sink.json
index 004d2eb..e7c6557 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-services.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-services.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-services.autowiredEnabled": {
+			"name": "camel.component.kubernetes-services.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json
index 0151fa7..d068f21 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-services.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-services.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-services.autowiredEnabled": {
+			"name": "camel.component.kubernetes-services.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kudu-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kudu-sink.json
index c8d0253..8fd9cc4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kudu-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kudu-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kudu.basicPropertyBinding": {
-			"name": "camel.component.kudu.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kudu.autowiredEnabled": {
+			"name": "camel.component.kudu.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-language-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-language-sink.json
index eea5672..c0a203d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-language-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-language-sink.json
@@ -69,13 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -90,11 +83,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.language.basicPropertyBinding": {
-			"name": "camel.component.language.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.language.autowiredEnabled": {
+			"name": "camel.component.language.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldap-sink.json
index c1a06af..fe641bd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldap-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -69,11 +62,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ldap.basicPropertyBinding": {
-			"name": "camel.component.ldap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ldap.autowiredEnabled": {
+			"name": "camel.component.ldap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldif-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldif-sink.json
index 5046689..a965f47 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldif-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldif-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ldif.basicPropertyBinding": {
-			"name": "camel.component.ldif.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ldif.autowiredEnabled": {
+			"name": "camel.component.ldif.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-log-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-log-sink.json
index ba1af8e..1fad9a5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-log-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-log-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.exchangeFormatter": {
 			"name": "camel.sink.endpoint.exchangeFormatter",
 			"description": "To use a custom exchange formatter",
@@ -212,11 +205,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.log.basicPropertyBinding": {
-			"name": "camel.component.log.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.log.autowiredEnabled": {
+			"name": "camel.component.log.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.log.exchangeFormatter": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lpr-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lpr-sink.json
index 41915e1..08f826d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lpr-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lpr-sink.json
@@ -99,13 +99,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -120,11 +113,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.lpr.basicPropertyBinding": {
-			"name": "camel.component.lpr.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.lpr.autowiredEnabled": {
+			"name": "camel.component.lpr.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lucene-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lucene-sink.json
index cf3b0b0..bc8de1f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lucene-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lucene-sink.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -97,11 +90,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.lucene.basicPropertyBinding": {
-			"name": "camel.component.lucene.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.lucene.autowiredEnabled": {
+			"name": "camel.component.lucene.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.lucene.config": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lumberjack-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lumberjack-source.json
index f4e2b77..ca7af91 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lumberjack-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lumberjack-source.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -68,11 +61,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.lumberjack.basicPropertyBinding": {
-			"name": "camel.component.lumberjack.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.lumberjack.autowiredEnabled": {
+			"name": "camel.component.lumberjack.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.lumberjack.sslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-master-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-master-source.json
index d89b37d..9062383 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-master-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-master-source.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.master.basicPropertyBinding": {
-			"name": "camel.component.master.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.master.autowiredEnabled": {
+			"name": "camel.component.master.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.master.service": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-metrics-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-metrics-sink.json
index 0faf95e..164b1c1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-metrics-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-metrics-sink.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -85,11 +78,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.metrics.basicPropertyBinding": {
-			"name": "camel.component.metrics.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.metrics.autowiredEnabled": {
+			"name": "camel.component.metrics.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.metrics.metricRegistry": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-micrometer-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-micrometer-sink.json
index e9d3738..0b203ba 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-micrometer-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-micrometer-sink.json
@@ -58,13 +58,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -79,11 +72,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.micrometer.basicPropertyBinding": {
-			"name": "camel.component.micrometer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.micrometer.autowiredEnabled": {
+			"name": "camel.component.micrometer.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.micrometer.metricsRegistry": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-microprofile-metrics-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-microprofile-metrics-sink.json
index 709ac6c..20bfef6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-microprofile-metrics-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-microprofile-metrics-sink.json
@@ -94,13 +94,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -115,11 +108,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.microprofile-metrics.basicPropertyBinding": {
-			"name": "camel.component.microprofile-metrics.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.microprofile-metrics.autowiredEnabled": {
+			"name": "camel.component.microprofile-metrics.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.microprofile-metrics.metricRegistry": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-sink.json
index 1f3f350..7948262 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -218,11 +211,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.milo-client.basicPropertyBinding": {
-			"name": "camel.component.milo-client.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.milo-client.autowiredEnabled": {
+			"name": "camel.component.milo-client.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.milo-client.allowedSecurityPolicies": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-source.json
index be019f2..a4fd9f9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -230,11 +223,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.milo-client.basicPropertyBinding": {
-			"name": "camel.component.milo-client.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.milo-client.autowiredEnabled": {
+			"name": "camel.component.milo-client.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.milo-client.allowedSecurityPolicies": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-sink.json
index 648de33..b424c8c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.milo-server.basicPropertyBinding": {
-			"name": "camel.component.milo-server.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.milo-server.autowiredEnabled": {
+			"name": "camel.component.milo-server.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.milo-server.certificate": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-source.json
index 5224430..c6398d4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-source.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -104,11 +97,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.milo-server.basicPropertyBinding": {
-			"name": "camel.component.milo-server.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.milo-server.autowiredEnabled": {
+			"name": "camel.component.milo-server.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.milo-server.certificate": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-sink.json
index 73a7925..9c72d1c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-sink.json
@@ -83,13 +83,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.maximumPoolSize": {
 			"name": "camel.sink.endpoint.maximumPoolSize",
 			"description": "Number of worker threads in the worker pool for TCP and UDP",
@@ -239,11 +232,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mina.basicPropertyBinding": {
-			"name": "camel.component.mina.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mina.autowiredEnabled": {
+			"name": "camel.component.mina.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mina.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-source.json
index ea986ff..512d26a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-source.json
@@ -102,13 +102,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.maximumPoolSize": {
 			"name": "camel.source.endpoint.maximumPoolSize",
 			"description": "Number of worker threads in the worker pool for TCP and UDP",
@@ -265,11 +258,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mina.basicPropertyBinding": {
-			"name": "camel.component.mina.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mina.autowiredEnabled": {
+			"name": "camel.component.mina.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mina.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-sink.json
index fddf6ad..1de6ae5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-sink.json
@@ -123,13 +123,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -263,11 +256,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.minio.basicPropertyBinding": {
-			"name": "camel.component.minio.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.minio.autowiredEnabled": {
+			"name": "camel.component.minio.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.minio.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-source.json
index 6c52e93..d5bc137 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-source.json
@@ -278,13 +278,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -641,11 +634,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.minio.basicPropertyBinding": {
-			"name": "camel.component.minio.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.minio.autowiredEnabled": {
+			"name": "camel.component.minio.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.minio.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-sink.json
index 02fac4b..df6dbde 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-sink.json
@@ -70,13 +70,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used (this component only supports synchronous operations).",
@@ -152,11 +145,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mllp.basicPropertyBinding": {
-			"name": "camel.component.mllp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mllp.autowiredEnabled": {
+			"name": "camel.component.mllp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mllp.defaultCharset": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-source.json
index 3e6e9e3..273cb6c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-source.json
@@ -83,13 +83,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used (this component only supports synchronous operations).",
@@ -199,11 +192,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mllp.basicPropertyBinding": {
-			"name": "camel.component.mllp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mllp.autowiredEnabled": {
+			"name": "camel.component.mllp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mllp.defaultCharset": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-sink.json
index 3fd9257..aff0102 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-sink.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -74,11 +67,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mongodb-gridfs.basicPropertyBinding": {
-			"name": "camel.component.mongodb-gridfs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mongodb-gridfs.autowiredEnabled": {
+			"name": "camel.component.mongodb-gridfs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-source.json
index d2f4a92..13b34f9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-source.json
@@ -107,13 +107,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -128,11 +121,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mongodb-gridfs.basicPropertyBinding": {
-			"name": "camel.component.mongodb-gridfs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mongodb-gridfs.autowiredEnabled": {
+			"name": "camel.component.mongodb-gridfs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-sink.json
index e4aebfb..266ad15 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-sink.json
@@ -65,13 +65,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.cursorRegenerationDelay": {
 			"name": "camel.sink.endpoint.cursorRegenerationDelay",
 			"description": "MongoDB tailable cursors will block until new data arrives. If no new data is inserted, after some time the cursor will be automatically freed and closed by the MongoDB server. The client is expected to regenerate the cursor if needed. This value specifies the time to wait before attempting to fetch a new cursor, and if the attempt fails, how long before the next attempt is made. Default value is 1000ms.",
@@ -170,11 +163,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mongodb.basicPropertyBinding": {
-			"name": "camel.component.mongodb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mongodb.autowiredEnabled": {
+			"name": "camel.component.mongodb.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-source.json
index 1132762..b90b8a7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-source.json
@@ -83,13 +83,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.cursorRegenerationDelay": {
 			"name": "camel.source.endpoint.cursorRegenerationDelay",
 			"description": "MongoDB tailable cursors will block until new data arrives. If no new data is inserted, after some time the cursor will be automatically freed and closed by the MongoDB server. The client is expected to regenerate the cursor if needed. This value specifies the time to wait before attempting to fetch a new cursor, and if the attempt fails, how long before the next attempt is made. Default value is 1000ms.",
@@ -188,11 +181,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mongodb.basicPropertyBinding": {
-			"name": "camel.component.mongodb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mongodb.autowiredEnabled": {
+			"name": "camel.component.mongodb.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-msv-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-msv-sink.json
index 8fea8db..4881c35 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-msv-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-msv-sink.json
@@ -42,13 +42,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.errorHandler": {
 			"name": "camel.sink.endpoint.errorHandler",
 			"description": "To use a custom org.apache.camel.processor.validation.ValidatorErrorHandler. The default error handler captures the errors and throws an exception.",
@@ -101,11 +94,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.msv.basicPropertyBinding": {
-			"name": "camel.component.msv.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.msv.autowiredEnabled": {
+			"name": "camel.component.msv.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.msv.resourceResolverFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mustache-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mustache-sink.json
index 3e32ded..b30a7b7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mustache-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mustache-sink.json
@@ -63,13 +63,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mustache.basicPropertyBinding": {
-			"name": "camel.component.mustache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mustache.autowiredEnabled": {
+			"name": "camel.component.mustache.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mustache.mustacheFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mvel-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mvel-sink.json
index 8fdebcf..b5b1251 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mvel-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mvel-sink.json
@@ -49,13 +49,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -84,11 +77,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mvel.basicPropertyBinding": {
-			"name": "camel.component.mvel.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mvel.autowiredEnabled": {
+			"name": "camel.component.mvel.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-bean-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-bean-sink.json
index 6b3ae11..692f7a3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-bean-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-bean-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -75,11 +68,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mybatis-bean.basicPropertyBinding": {
-			"name": "camel.component.mybatis-bean.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mybatis-bean.autowiredEnabled": {
+			"name": "camel.component.mybatis-bean.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mybatis-bean.sqlSessionFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-sink.json
index ef4c710..10ac780 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -75,11 +68,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mybatis.basicPropertyBinding": {
-			"name": "camel.component.mybatis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mybatis.autowiredEnabled": {
+			"name": "camel.component.mybatis.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mybatis.sqlSessionFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-source.json
index bfa42d4..2b6dd60 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-source.json
@@ -87,13 +87,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -208,11 +201,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mybatis.basicPropertyBinding": {
-			"name": "camel.component.mybatis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mybatis.autowiredEnabled": {
+			"name": "camel.component.mybatis.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mybatis.sqlSessionFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nagios-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nagios-sink.json
index 9944414..1943d28 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nagios-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nagios-sink.json
@@ -49,13 +49,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -96,11 +89,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nagios.basicPropertyBinding": {
-			"name": "camel.component.nagios.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nagios.autowiredEnabled": {
+			"name": "camel.component.nagios.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.nagios.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-sink.json
index ba99c54..e4f738d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-sink.json
@@ -125,13 +125,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connection": {
 			"name": "camel.sink.endpoint.connection",
 			"description": "Reference an already instantiated connection to Nats server",
@@ -145,6 +138,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.traceConnection": {
+			"name": "camel.sink.endpoint.traceConnection",
+			"description": "Whether or not connection trace messages should be printed to standard out for fine grained debugging of connection issues.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.secure": {
 			"name": "camel.sink.endpoint.secure",
 			"description": "Set secure option indicating TLS is required",
@@ -178,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nats.basicPropertyBinding": {
-			"name": "camel.component.nats.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nats.autowiredEnabled": {
+			"name": "camel.component.nats.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.nats.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-source.json
index ff5be7e..c38dce2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-source.json
@@ -157,13 +157,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connection": {
 			"name": "camel.source.endpoint.connection",
 			"description": "Reference an already instantiated connection to Nats server",
@@ -177,6 +170,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.traceConnection": {
+			"name": "camel.source.endpoint.traceConnection",
+			"description": "Whether or not connection trace messages should be printed to standard out for fine grained debugging of connection issues.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.secure": {
 			"name": "camel.source.endpoint.secure",
 			"description": "Set secure option indicating TLS is required",
@@ -210,11 +210,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nats.basicPropertyBinding": {
-			"name": "camel.component.nats.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nats.autowiredEnabled": {
+			"name": "camel.component.nats.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.nats.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
index 6428d1a..9705bc9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
@@ -183,13 +183,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.channelGroup": {
 			"name": "camel.sink.endpoint.channelGroup",
 			"description": "To use a explicit ChannelGroup.",
@@ -516,11 +509,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.netty-http.basicPropertyBinding": {
-			"name": "camel.component.netty-http.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.netty-http.autowiredEnabled": {
+			"name": "camel.component.netty-http.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.netty-http.channelGroup": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-source.json
index eadb818..3958b43 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-source.json
@@ -256,13 +256,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.channelGroup": {
 			"name": "camel.source.endpoint.channelGroup",
 			"description": "To use a explicit ChannelGroup.",
@@ -640,11 +633,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.netty-http.basicPropertyBinding": {
-			"name": "camel.component.netty-http.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.netty-http.autowiredEnabled": {
+			"name": "camel.component.netty-http.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.netty-http.channelGroup": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-sink.json
index 2d62b86..580917f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nitrite.basicPropertyBinding": {
-			"name": "camel.component.nitrite.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nitrite.autowiredEnabled": {
+			"name": "camel.component.nitrite.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-source.json
index 309be8f..b3800c4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -85,11 +78,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nitrite.basicPropertyBinding": {
-			"name": "camel.component.nitrite.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nitrite.autowiredEnabled": {
+			"name": "camel.component.nitrite.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-sink.json
index 212bf29..44c46a2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-sink.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -81,11 +74,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nsq.basicPropertyBinding": {
-			"name": "camel.component.nsq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nsq.autowiredEnabled": {
+			"name": "camel.component.nsq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.nsq.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-source.json
index c62fa74..0092528 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-source.json
@@ -100,13 +100,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -140,11 +133,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nsq.basicPropertyBinding": {
-			"name": "camel.component.nsq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nsq.autowiredEnabled": {
+			"name": "camel.component.nsq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.nsq.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-sink.json
index f321ff4..c3f6bca 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-sink.json
@@ -67,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -102,11 +95,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.oaipmh.basicPropertyBinding": {
-			"name": "camel.component.oaipmh.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.oaipmh.autowiredEnabled": {
+			"name": "camel.component.oaipmh.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-source.json
index 8011b71..de7bfe2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-source.json
@@ -85,13 +85,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -213,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.oaipmh.basicPropertyBinding": {
-			"name": "camel.component.oaipmh.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.oaipmh.autowiredEnabled": {
+			"name": "camel.component.oaipmh.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-sink.json
index fdae45e..ca5b675 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-sink.json
@@ -92,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.httpAsyncClientBuilder": {
 			"name": "camel.sink.endpoint.httpAsyncClientBuilder",
 			"description": "Custom HTTP async client builder for more complex HTTP client configuration, overrides connectionTimeout, socketTimeout, proxy and sslContext. Note that a socketTimeout MUST be specified in the builder, otherwise OData requests could block indefinitely",
@@ -195,11 +188,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.olingo2.basicPropertyBinding": {
-			"name": "camel.component.olingo2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.olingo2.autowiredEnabled": {
+			"name": "camel.component.olingo2.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.olingo2.httpAsyncClientBuilder": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-source.json
index 400fbe7..3152e39 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-source.json
@@ -124,13 +124,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.httpAsyncClientBuilder": {
 			"name": "camel.source.endpoint.httpAsyncClientBuilder",
 			"description": "Custom HTTP async client builder for more complex HTTP client configuration, overrides connectionTimeout, socketTimeout, proxy and sslContext. Note that a socketTimeout MUST be specified in the builder, otherwise OData requests could block indefinitely",
@@ -327,11 +320,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.olingo2.basicPropertyBinding": {
-			"name": "camel.component.olingo2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.olingo2.autowiredEnabled": {
+			"name": "camel.component.olingo2.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.olingo2.httpAsyncClientBuilder": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-sink.json
index 59b4e5c..9fb132c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-sink.json
@@ -80,13 +80,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.httpAsyncClientBuilder": {
 			"name": "camel.sink.endpoint.httpAsyncClientBuilder",
 			"description": "Custom HTTP async client builder for more complex HTTP client configuration, overrides connectionTimeout, socketTimeout, proxy and sslContext. Note that a socketTimeout MUST be specified in the builder, otherwise OData requests could block indefinitely",
@@ -171,11 +164,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.olingo4.basicPropertyBinding": {
-			"name": "camel.component.olingo4.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.olingo4.autowiredEnabled": {
+			"name": "camel.component.olingo4.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.olingo4.httpAsyncClientBuilder": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-source.json
index a9b36a7..22f0483 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-source.json
@@ -112,13 +112,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.httpAsyncClientBuilder": {
 			"name": "camel.source.endpoint.httpAsyncClientBuilder",
 			"description": "Custom HTTP async client builder for more complex HTTP client configuration, overrides connectionTimeout, socketTimeout, proxy and sslContext. Note that a socketTimeout MUST be specified in the builder, otherwise OData requests could block indefinitely",
@@ -303,11 +296,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.olingo4.basicPropertyBinding": {
-			"name": "camel.component.olingo4.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.olingo4.autowiredEnabled": {
+			"name": "camel.component.olingo4.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.olingo4.httpAsyncClientBuilder": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-build-configs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-build-configs-sink.json
index 7a2ebee..f3943ad 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-build-configs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-build-configs-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openshift-build-configs.basicPropertyBinding": {
-			"name": "camel.component.openshift-build-configs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openshift-build-configs.autowiredEnabled": {
+			"name": "camel.component.openshift-build-configs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-builds-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-builds-sink.json
index 44fc063..d2975ce 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-builds-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-builds-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openshift-builds.basicPropertyBinding": {
-			"name": "camel.component.openshift-builds.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openshift-builds.autowiredEnabled": {
+			"name": "camel.component.openshift-builds.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-cinder-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-cinder-sink.json
index 69f54be..aa39dfc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-cinder-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-cinder-sink.json
@@ -72,13 +72,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -93,11 +86,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openstack-cinder.basicPropertyBinding": {
-			"name": "camel.component.openstack-cinder.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openstack-cinder.autowiredEnabled": {
+			"name": "camel.component.openstack-cinder.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-glance-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-glance-sink.json
index bf6fc0d..95b30e1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-glance-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-glance-sink.json
@@ -66,13 +66,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -87,11 +80,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openstack-glance.basicPropertyBinding": {
-			"name": "camel.component.openstack-glance.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openstack-glance.autowiredEnabled": {
+			"name": "camel.component.openstack-glance.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-keystone-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-keystone-sink.json
index 6a7456a..bf6ee10 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-keystone-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-keystone-sink.json
@@ -65,13 +65,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -86,11 +79,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openstack-keystone.basicPropertyBinding": {
-			"name": "camel.component.openstack-keystone.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openstack-keystone.autowiredEnabled": {
+			"name": "camel.component.openstack-keystone.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-neutron-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-neutron-sink.json
index 71900b2..2ff77ab 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-neutron-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-neutron-sink.json
@@ -72,13 +72,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -93,11 +86,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openstack-neutron.basicPropertyBinding": {
-			"name": "camel.component.openstack-neutron.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openstack-neutron.autowiredEnabled": {
+			"name": "camel.component.openstack-neutron.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-nova-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-nova-sink.json
index ee13a1a..d37b82a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-nova-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-nova-sink.json
@@ -72,13 +72,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -93,11 +86,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openstack-nova.basicPropertyBinding": {
-			"name": "camel.component.openstack-nova.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openstack-nova.autowiredEnabled": {
+			"name": "camel.component.openstack-nova.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-swift-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-swift-sink.json
index 3bc0810..5066da0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-swift-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-swift-sink.json
@@ -72,13 +72,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -93,11 +86,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openstack-swift.basicPropertyBinding": {
-			"name": "camel.component.openstack-swift.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openstack-swift.autowiredEnabled": {
+			"name": "camel.component.openstack-swift.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-sink.json
index b1eba03..6ac4ef9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-sink.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -78,11 +71,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.optaplanner.basicPropertyBinding": {
-			"name": "camel.component.optaplanner.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.optaplanner.autowiredEnabled": {
+			"name": "camel.component.optaplanner.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-source.json
index 3eb6ab9..517c390 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-source.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -76,11 +69,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.optaplanner.basicPropertyBinding": {
-			"name": "camel.component.optaplanner.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.optaplanner.autowiredEnabled": {
+			"name": "camel.component.optaplanner.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-sink.json
index db0f150..9677fce 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-sink.json
@@ -141,13 +141,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.client": {
 			"name": "camel.sink.endpoint.client",
 			"description": "To use an existing mqtt client",
@@ -343,11 +336,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.paho.basicPropertyBinding": {
-			"name": "camel.component.paho.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.paho.autowiredEnabled": {
+			"name": "camel.component.paho.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.paho.client": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-source.json
index 9605eba..d334b27 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-source.json
@@ -153,13 +153,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.client": {
 			"name": "camel.source.endpoint.client",
 			"description": "To use an existing mqtt client",
@@ -355,11 +348,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.paho.basicPropertyBinding": {
-			"name": "camel.component.paho.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.paho.autowiredEnabled": {
+			"name": "camel.component.paho.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.paho.client": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pdf-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pdf-sink.json
index aeb57d5..4cd3751 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pdf-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pdf-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -99,11 +92,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pdf.basicPropertyBinding": {
-			"name": "camel.component.pdf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pdf.autowiredEnabled": {
+			"name": "camel.component.pdf.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pg-replication-slot-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pg-replication-slot-source.json
index 44474b0..513a41e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pg-replication-slot-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pg-replication-slot-source.json
@@ -93,13 +93,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.slotOptions": {
 			"name": "camel.source.endpoint.slotOptions",
 			"description": "Slot options to be passed to the output plugin.",
@@ -220,11 +213,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pg-replication-slot.basicPropertyBinding": {
-			"name": "camel.component.pg-replication-slot.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pg-replication-slot.autowiredEnabled": {
+			"name": "camel.component.pg-replication-slot.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-sink.json
index 7fbf473..616fee9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -82,11 +75,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pgevent.basicPropertyBinding": {
-			"name": "camel.component.pgevent.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pgevent.autowiredEnabled": {
+			"name": "camel.component.pgevent.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-source.json
index 5d0468f..758e9d8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-source.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pgevent.basicPropertyBinding": {
-			"name": "camel.component.pgevent.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pgevent.autowiredEnabled": {
+			"name": "camel.component.pgevent.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-platform-http-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-platform-http-source.json
index 0bb7dbf..c81aa9d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-platform-http-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-platform-http-source.json
@@ -65,13 +65,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter headers to and from Camel message.",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.platform-http.basicPropertyBinding": {
-			"name": "camel.component.platform-http.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.platform-http.autowiredEnabled": {
+			"name": "camel.component.platform-http.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.platform-http.engine": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-sink.json
index dc612ce..e28ff58 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -275,11 +268,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pop3.basicPropertyBinding": {
-			"name": "camel.component.pop3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pop3.autowiredEnabled": {
+			"name": "camel.component.pop3.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.pop3.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-source.json
index 4e4f738..b2ace02 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-source.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -528,11 +521,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pop3.basicPropertyBinding": {
-			"name": "camel.component.pop3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pop3.autowiredEnabled": {
+			"name": "camel.component.pop3.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.pop3.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-sink.json
index f7cabe0..6218580 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -275,11 +268,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pop3s.basicPropertyBinding": {
-			"name": "camel.component.pop3s.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pop3s.autowiredEnabled": {
+			"name": "camel.component.pop3s.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.pop3s.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-source.json
index a65bbfe..fe7103c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-source.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -528,11 +521,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pop3s.basicPropertyBinding": {
-			"name": "camel.component.pop3s.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pop3s.autowiredEnabled": {
+			"name": "camel.component.pop3s.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.pop3s.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-sink.json
index 4b1be34..d7ddb06 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.pubnub": {
 			"name": "camel.sink.endpoint.pubnub",
 			"description": "Reference to a Pubnub client in the registry.",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pubnub.basicPropertyBinding": {
-			"name": "camel.component.pubnub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pubnub.autowiredEnabled": {
+			"name": "camel.component.pubnub.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-source.json
index e1e583c..c86f8dc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-source.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.pubnub": {
 			"name": "camel.source.endpoint.pubnub",
 			"description": "Reference to a Pubnub client in the registry.",
@@ -111,11 +104,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pubnub.basicPropertyBinding": {
-			"name": "camel.component.pubnub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pubnub.autowiredEnabled": {
+			"name": "camel.component.pubnub.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-sink.json
index 1f6ae6c..578a690 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-sink.json
@@ -129,13 +129,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -251,11 +244,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pulsar.basicPropertyBinding": {
-			"name": "camel.component.pulsar.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pulsar.autowiredEnabled": {
+			"name": "camel.component.pulsar.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.pulsar.pulsarClient": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json
index 36414b3..a65a861 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json
@@ -162,13 +162,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -311,11 +304,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pulsar.basicPropertyBinding": {
-			"name": "camel.component.pulsar.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pulsar.autowiredEnabled": {
+			"name": "camel.component.pulsar.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.pulsar.pulsarClient": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quartz-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quartz-source.json
index b3bf3fc..664d597 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quartz-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quartz-source.json
@@ -82,13 +82,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.customCalendar": {
 			"name": "camel.source.endpoint.customCalendar",
 			"description": "Specifies a custom calendar to avoid specific range of date",
@@ -201,11 +194,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.quartz.basicPropertyBinding": {
-			"name": "camel.component.quartz.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.quartz.autowiredEnabled": {
+			"name": "camel.component.quartz.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.quartz.scheduler": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-sink.json
index 0922a4b..6728ba4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-sink.json
@@ -35,13 +35,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -63,11 +56,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.quickfix.basicPropertyBinding": {
-			"name": "camel.component.quickfix.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.quickfix.autowiredEnabled": {
+			"name": "camel.component.quickfix.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.quickfix.logFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-source.json
index 221245b..f7df7a7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-source.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -75,11 +68,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.quickfix.basicPropertyBinding": {
-			"name": "camel.component.quickfix.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.quickfix.autowiredEnabled": {
+			"name": "camel.component.quickfix.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.quickfix.logFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-sink.json
index 6e46800..9aafec4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-sink.json
@@ -254,13 +254,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientProperties": {
 			"name": "camel.sink.endpoint.clientProperties",
 			"description": "Connection client properties (client info used in negotiating with the server)",
@@ -581,11 +574,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rabbitmq.basicPropertyBinding": {
-			"name": "camel.component.rabbitmq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rabbitmq.autowiredEnabled": {
+			"name": "camel.component.rabbitmq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.rabbitmq.clientProperties": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-source.json
index a798931..d6d7d1f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-source.json
@@ -252,13 +252,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.clientProperties": {
 			"name": "camel.source.endpoint.clientProperties",
 			"description": "Connection client properties (client info used in negotiating with the server)",
@@ -559,11 +552,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rabbitmq.basicPropertyBinding": {
-			"name": "camel.component.rabbitmq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rabbitmq.autowiredEnabled": {
+			"name": "camel.component.rabbitmq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.rabbitmq.clientProperties": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-sink.json
index 31f40c1..db4481c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -76,11 +69,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.reactive-streams.basicPropertyBinding": {
-			"name": "camel.component.reactive-streams.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.reactive-streams.autowiredEnabled": {
+			"name": "camel.component.reactive-streams.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.reactive-streams.reactiveStreamsEngineConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-source.json
index 8b50239..957191d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-source.json
@@ -69,13 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.reactive-streams.basicPropertyBinding": {
-			"name": "camel.component.reactive-streams.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.reactive-streams.autowiredEnabled": {
+			"name": "camel.component.reactive-streams.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.reactive-streams.reactiveStreamsEngineConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-api-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-api-source.json
index fbab86e..da3fe04 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-api-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-api-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rest-api.basicPropertyBinding": {
-			"name": "camel.component.rest-api.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rest-api.autowiredEnabled": {
+			"name": "camel.component.rest-api.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-openapi-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-openapi-sink.json
index 67d019a..9b8172e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-openapi-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-openapi-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -117,11 +110,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rest-openapi.basicPropertyBinding": {
-			"name": "camel.component.rest-openapi.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rest-openapi.autowiredEnabled": {
+			"name": "camel.component.rest-openapi.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.rest-openapi.sslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-sink.json
index 5c4762a..96ff8d4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-sink.json
@@ -94,13 +94,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -139,11 +132,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rest.basicPropertyBinding": {
-			"name": "camel.component.rest.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rest.autowiredEnabled": {
+			"name": "camel.component.rest.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-source.json
index a603444..b816567 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-source.json
@@ -88,13 +88,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -115,11 +108,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rest.basicPropertyBinding": {
-			"name": "camel.component.rest.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rest.autowiredEnabled": {
+			"name": "camel.component.rest.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-swagger-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-swagger-sink.json
index 5348ca2..f3c86ec 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-swagger-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-swagger-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -123,11 +116,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rest-swagger.basicPropertyBinding": {
-			"name": "camel.component.rest-swagger.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rest-swagger.autowiredEnabled": {
+			"name": "camel.component.rest-swagger.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.rest-swagger.sslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json
index 591d070..637fb68 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json
@@ -144,13 +144,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -236,11 +229,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.resteasy.basicPropertyBinding": {
-			"name": "camel.component.resteasy.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.resteasy.autowiredEnabled": {
+			"name": "camel.component.resteasy.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.resteasy.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json
index 7675b15..750c816 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json
@@ -122,13 +122,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -220,11 +213,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.resteasy.basicPropertyBinding": {
-			"name": "camel.component.resteasy.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.resteasy.autowiredEnabled": {
+			"name": "camel.component.resteasy.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.resteasy.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rss-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rss-source.json
index eef717e..24b7695 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rss-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rss-source.json
@@ -100,13 +100,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -214,11 +207,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rss.basicPropertyBinding": {
-			"name": "camel.component.rss.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rss.autowiredEnabled": {
+			"name": "camel.component.rss.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-saga-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-saga-sink.json
index 6c56be1..1fe7755 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-saga-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-saga-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.saga.basicPropertyBinding": {
-			"name": "camel.component.saga.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.saga.autowiredEnabled": {
+			"name": "camel.component.saga.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-sink.json
index ae09777..c2f48bf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-sink.json
@@ -36,7 +36,7 @@
 		"camel.sink.endpoint.apiVersion": {
 			"name": "camel.sink.endpoint.apiVersion",
 			"description": "Salesforce API version.",
-			"defaultValue": "\"34.0\"",
+			"defaultValue": "\"50.0\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -256,13 +256,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -291,7 +284,7 @@
 		"camel.component.salesforce.apiVersion": {
 			"name": "camel.component.salesforce.apiVersion",
 			"description": "Salesforce API version.",
-			"defaultValue": "\"34.0\"",
+			"defaultValue": "\"50.0\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -555,11 +548,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.salesforce.basicPropertyBinding": {
-			"name": "camel.component.salesforce.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.salesforce.autowiredEnabled": {
+			"name": "camel.component.salesforce.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.salesforce.httpProxyExcludedAddresses": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-source.json
index 826e7bf..425fd94 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-source.json
@@ -36,7 +36,7 @@
 		"camel.source.endpoint.apiVersion": {
 			"name": "camel.source.endpoint.apiVersion",
 			"description": "Salesforce API version.",
-			"defaultValue": "\"34.0\"",
+			"defaultValue": "\"50.0\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -274,13 +274,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -309,7 +302,7 @@
 		"camel.component.salesforce.apiVersion": {
 			"name": "camel.component.salesforce.apiVersion",
 			"description": "Salesforce API version.",
-			"defaultValue": "\"34.0\"",
+			"defaultValue": "\"50.0\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -573,11 +566,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.salesforce.basicPropertyBinding": {
-			"name": "camel.component.salesforce.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.salesforce.autowiredEnabled": {
+			"name": "camel.component.salesforce.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.salesforce.httpProxyExcludedAddresses": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sap-netweaver-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sap-netweaver-sink.json
index ca58217..1688d99 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sap-netweaver-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sap-netweaver-sink.json
@@ -55,13 +55,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -76,11 +69,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sap-netweaver.basicPropertyBinding": {
-			"name": "camel.component.sap-netweaver.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sap-netweaver.autowiredEnabled": {
+			"name": "camel.component.sap-netweaver.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scheduler-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scheduler-source.json
index 0752e92..dcaf2bb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scheduler-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scheduler-source.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -168,11 +161,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.scheduler.basicPropertyBinding": {
-			"name": "camel.component.scheduler.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.scheduler.autowiredEnabled": {
+			"name": "camel.component.scheduler.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.scheduler.concurrentTasks": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-schematron-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-schematron-sink.json
index c1e5b0c..db713f2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-schematron-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-schematron-sink.json
@@ -35,13 +35,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -62,11 +55,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.schematron.basicPropertyBinding": {
-			"name": "camel.component.schematron.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.schematron.autowiredEnabled": {
+			"name": "camel.component.schematron.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scp-sink.json
index 433bf5f..1993a88 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scp-sink.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectTimeout": {
 			"name": "camel.sink.endpoint.connectTimeout",
 			"description": "Sets the connect timeout for waiting for a connection to be established Used by both FTPClient and JSCH",
@@ -199,11 +192,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.scp.basicPropertyBinding": {
-			"name": "camel.component.scp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.scp.autowiredEnabled": {
+			"name": "camel.component.scp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-sink.json
index 261ed5b..13db27e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.queue": {
 			"name": "camel.sink.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -124,11 +117,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.seda.basicPropertyBinding": {
-			"name": "camel.component.seda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.seda.autowiredEnabled": {
+			"name": "camel.component.seda.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.seda.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-source.json
index bdcec81..a3318b1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-source.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.queue": {
 			"name": "camel.source.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.seda.basicPropertyBinding": {
-			"name": "camel.component.seda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.seda.autowiredEnabled": {
+			"name": "camel.component.seda.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.seda.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-service-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-service-source.json
index 31e9ca4..08e00c5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-service-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-service-source.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -55,11 +48,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.service.basicPropertyBinding": {
-			"name": "camel.component.service.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.service.autowiredEnabled": {
+			"name": "camel.component.service.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.service.service": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servicenow-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servicenow-sink.json
index be46ca4..1f93d08 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servicenow-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servicenow-sink.json
@@ -176,13 +176,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.dateFormat": {
 			"name": "camel.sink.endpoint.dateFormat",
 			"description": "The date format used for Json serialization\/deserialization",
@@ -469,11 +462,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.servicenow.basicPropertyBinding": {
-			"name": "camel.component.servicenow.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.servicenow.autowiredEnabled": {
+			"name": "camel.component.servicenow.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.servicenow.dateFormat": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servlet-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servlet-source.json
index 5d82525..0771dcb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servlet-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servlet-source.json
@@ -141,13 +141,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.mapHttpMessageBody": {
 			"name": "camel.source.endpoint.mapHttpMessageBody",
 			"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.",
@@ -216,11 +209,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.servlet.basicPropertyBinding": {
-			"name": "camel.component.servlet.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.servlet.autowiredEnabled": {
+			"name": "camel.component.servlet.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.servlet.httpBinding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-sink.json
index 3367a98..021b5a7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-sink.json
@@ -187,13 +187,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bindAddress": {
 			"name": "camel.sink.endpoint.bindAddress",
 			"description": "Specifies the address of the local interface against which the connection should bind.",
@@ -385,11 +378,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sftp.basicPropertyBinding": {
-			"name": "camel.component.sftp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sftp.autowiredEnabled": {
+			"name": "camel.component.sftp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-source.json
index d659c28..77c8e89 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-source.json
@@ -218,13 +218,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bindAddress": {
 			"name": "camel.source.endpoint.bindAddress",
 			"description": "Specifies the address of the local interface against which the connection should bind.",
@@ -729,11 +722,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sftp.basicPropertyBinding": {
-			"name": "camel.component.sftp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sftp.autowiredEnabled": {
+			"name": "camel.component.sftp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-sink.json
index 21fbcae..9ac9c2e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-sink.json
@@ -125,13 +125,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.callIdHeader": {
 			"name": "camel.sink.endpoint.callIdHeader",
 			"description": "A custom Header object containing call details. Must implement the type javax.sip.header.CallIdHeader",
@@ -281,11 +274,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sip.basicPropertyBinding": {
-			"name": "camel.component.sip.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sip.autowiredEnabled": {
+			"name": "camel.component.sip.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-source.json
index 15a68a3..232c1a7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-source.json
@@ -151,13 +151,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.callIdHeader": {
 			"name": "camel.source.endpoint.callIdHeader",
 			"description": "A custom Header object containing call details. Must implement the type javax.sip.header.CallIdHeader",
@@ -307,11 +300,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sip.basicPropertyBinding": {
-			"name": "camel.component.sip.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sip.autowiredEnabled": {
+			"name": "camel.component.sip.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-sink.json
index b95413b..e29f7b5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-sink.json
@@ -125,13 +125,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.callIdHeader": {
 			"name": "camel.sink.endpoint.callIdHeader",
 			"description": "A custom Header object containing call details. Must implement the type javax.sip.header.CallIdHeader",
@@ -281,11 +274,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sips.basicPropertyBinding": {
-			"name": "camel.component.sips.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sips.autowiredEnabled": {
+			"name": "camel.component.sips.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-source.json
index 5b6d1e4..103d1f6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-source.json
@@ -151,13 +151,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.callIdHeader": {
 			"name": "camel.source.endpoint.callIdHeader",
 			"description": "A custom Header object containing call details. Must implement the type javax.sip.header.CallIdHeader",
@@ -307,11 +300,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sips.basicPropertyBinding": {
-			"name": "camel.component.sips.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sips.autowiredEnabled": {
+			"name": "camel.component.sips.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-batch-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-batch-source.json
index 0777847..da84c51 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-batch-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-batch-source.json
@@ -123,13 +123,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -189,11 +182,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms-batch.basicPropertyBinding": {
-			"name": "camel.component.sjms-batch.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sjms-batch.autowiredEnabled": {
+			"name": "camel.component.sjms-batch.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sjms-batch.connectionFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-sink.json
index cb38155..f0d4a25 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-sink.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionCount": {
 			"name": "camel.sink.endpoint.connectionCount",
 			"description": "The maximum number of connections available to this endpoint",
@@ -187,6 +180,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.sjms.connectionFactory": {
+			"name": "camel.component.sjms.connectionFactory",
+			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.sjms.lazyStartProducer": {
 			"name": "camel.component.sjms.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -194,11 +193,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms.basicPropertyBinding": {
-			"name": "camel.component.sjms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sjms.autowiredEnabled": {
+			"name": "camel.component.sjms.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sjms.connectionClientId": {
@@ -207,12 +206,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms.connectionFactory": {
-			"name": "camel.component.sjms.connectionFactory",
-			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.sjms.connectionMaxWait": {
 			"name": "camel.component.sjms.connectionMaxWait",
 			"description": "The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-source.json
index 5eced02..47a98f2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-source.json
@@ -102,13 +102,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionCount": {
 			"name": "camel.source.endpoint.connectionCount",
 			"description": "The maximum number of connections available to this endpoint",
@@ -226,6 +219,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.sjms.connectionFactory": {
+			"name": "camel.component.sjms.connectionFactory",
+			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.sjms.bridgeErrorHandler": {
 			"name": "camel.component.sjms.bridgeErrorHandler",
 			"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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -247,11 +246,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms.basicPropertyBinding": {
-			"name": "camel.component.sjms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sjms.autowiredEnabled": {
+			"name": "camel.component.sjms.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sjms.connectionClientId": {
@@ -260,12 +259,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms.connectionFactory": {
-			"name": "camel.component.sjms.connectionFactory",
-			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.sjms.connectionMaxWait": {
 			"name": "camel.component.sjms.connectionMaxWait",
 			"description": "The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-sink.json
index ec00bbc..356b858 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-sink.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionCount": {
 			"name": "camel.sink.endpoint.connectionCount",
 			"description": "The maximum number of connections available to this endpoint",
@@ -187,6 +180,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.sjms2.connectionFactory": {
+			"name": "camel.component.sjms2.connectionFactory",
+			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.sjms2.lazyStartProducer": {
 			"name": "camel.component.sjms2.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -194,11 +193,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms2.basicPropertyBinding": {
-			"name": "camel.component.sjms2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sjms2.autowiredEnabled": {
+			"name": "camel.component.sjms2.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sjms2.connectionClientId": {
@@ -207,12 +206,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms2.connectionFactory": {
-			"name": "camel.component.sjms2.connectionFactory",
-			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.sjms2.connectionMaxWait": {
 			"name": "camel.component.sjms2.connectionMaxWait",
 			"description": "The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-source.json
index 9d35f22..ddfa500 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-source.json
@@ -122,13 +122,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionCount": {
 			"name": "camel.source.endpoint.connectionCount",
 			"description": "The maximum number of connections available to this endpoint",
@@ -246,6 +239,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.sjms2.connectionFactory": {
+			"name": "camel.component.sjms2.connectionFactory",
+			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.sjms2.bridgeErrorHandler": {
 			"name": "camel.component.sjms2.bridgeErrorHandler",
 			"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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -267,11 +266,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms2.basicPropertyBinding": {
-			"name": "camel.component.sjms2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sjms2.autowiredEnabled": {
+			"name": "camel.component.sjms2.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sjms2.connectionClientId": {
@@ -280,12 +279,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms2.connectionFactory": {
-			"name": "camel.component.sjms2.connectionFactory",
-			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.sjms2.connectionMaxWait": {
 			"name": "camel.component.sjms2.connectionMaxWait",
 			"description": "The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
index 1bcdc48..ec51297 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -67,11 +60,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.slack.basicPropertyBinding": {
-			"name": "camel.component.slack.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.slack.autowiredEnabled": {
+			"name": "camel.component.slack.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.slack.webhookUrl": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
index cf3a868..b30d70b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
@@ -67,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -181,11 +174,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.slack.basicPropertyBinding": {
-			"name": "camel.component.slack.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.slack.autowiredEnabled": {
+			"name": "camel.component.slack.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.slack.webhookUrl": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-sink.json
index 2070455..b38c674 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-sink.json
@@ -151,13 +151,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.enquireLinkTimer": {
 			"name": "camel.sink.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
@@ -383,11 +376,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smpp.basicPropertyBinding": {
-			"name": "camel.component.smpp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smpp.autowiredEnabled": {
+			"name": "camel.component.smpp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smpp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-source.json
index ab50c5a..f9461c2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-source.json
@@ -82,13 +82,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.enquireLinkTimer": {
 			"name": "camel.source.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
@@ -233,11 +226,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smpp.basicPropertyBinding": {
-			"name": "camel.component.smpp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smpp.autowiredEnabled": {
+			"name": "camel.component.smpp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smpp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-sink.json
index a3ccdcd..406e2fe 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-sink.json
@@ -151,13 +151,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.enquireLinkTimer": {
 			"name": "camel.sink.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
@@ -383,11 +376,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smpps.basicPropertyBinding": {
-			"name": "camel.component.smpps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smpps.autowiredEnabled": {
+			"name": "camel.component.smpps.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smpps.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-source.json
index 85a57e7..238b2db 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-source.json
@@ -82,13 +82,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.enquireLinkTimer": {
 			"name": "camel.source.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
@@ -233,11 +226,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smpps.basicPropertyBinding": {
-			"name": "camel.component.smpps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smpps.autowiredEnabled": {
+			"name": "camel.component.smpps.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smpps.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-sink.json
index af1b171..ee22226 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -275,11 +268,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smtp.basicPropertyBinding": {
-			"name": "camel.component.smtp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smtp.autowiredEnabled": {
+			"name": "camel.component.smtp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smtp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-source.json
index 6665570..afcdf30 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-source.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -528,11 +521,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smtp.basicPropertyBinding": {
-			"name": "camel.component.smtp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smtp.autowiredEnabled": {
+			"name": "camel.component.smtp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smtp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-sink.json
index fde6818..6bc8702 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -275,11 +268,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smtps.basicPropertyBinding": {
-			"name": "camel.component.smtps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smtps.autowiredEnabled": {
+			"name": "camel.component.smtps.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smtps.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-source.json
index 7271817..61a9833 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-source.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -528,11 +521,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smtps.basicPropertyBinding": {
-			"name": "camel.component.smtps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smtps.autowiredEnabled": {
+			"name": "camel.component.smtps.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smtps.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-sink.json
index 3b920d4..41198c9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-sink.json
@@ -87,13 +87,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -145,11 +138,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.snmp.basicPropertyBinding": {
-			"name": "camel.component.snmp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.snmp.autowiredEnabled": {
+			"name": "camel.component.snmp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-source.json
index 56b664a..13b5175 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -270,11 +263,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.snmp.basicPropertyBinding": {
-			"name": "camel.component.snmp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.snmp.autowiredEnabled": {
+			"name": "camel.component.snmp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solr-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solr-sink.json
index 068d0d5..e255ba5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solr-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solr-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.solr.basicPropertyBinding": {
-			"name": "camel.component.solr.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.solr.autowiredEnabled": {
+			"name": "camel.component.solr.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrCloud-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrCloud-sink.json
index abe01f3..743222a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrCloud-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrCloud-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.solrcloud.basicPropertyBinding": {
-			"name": "camel.component.solrcloud.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.solrcloud.autowiredEnabled": {
+			"name": "camel.component.solrcloud.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrs-sink.json
index 6703fe0..b8302c2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrs-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.solrs.basicPropertyBinding": {
-			"name": "camel.component.solrs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.solrs.autowiredEnabled": {
+			"name": "camel.component.solrs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-sink.json
index 2f48026..66f6661 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-sink.json
@@ -71,13 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -140,11 +133,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.soroush.basicPropertyBinding": {
-			"name": "camel.component.soroush.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.soroush.autowiredEnabled": {
+			"name": "camel.component.soroush.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.soroush.authorizationToken": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-source.json
index 6544881..7f84f58 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-source.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -131,11 +124,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.soroush.basicPropertyBinding": {
-			"name": "camel.component.soroush.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.soroush.autowiredEnabled": {
+			"name": "camel.component.soroush.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.soroush.authorizationToken": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spark-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spark-sink.json
index e377585..73728fc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spark-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spark-sink.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -86,11 +79,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spark.basicPropertyBinding": {
-			"name": "camel.component.spark.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spark.autowiredEnabled": {
+			"name": "camel.component.spark.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-hec-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-hec-sink.json
index 92e6e7a..cfbb325 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-hec-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-hec-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -90,11 +83,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.splunk-hec.basicPropertyBinding": {
-			"name": "camel.component.splunk-hec.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.splunk-hec.autowiredEnabled": {
+			"name": "camel.component.splunk-hec.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-sink.json
index 1c0507c..ac73644 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-sink.json
@@ -99,13 +99,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -146,11 +139,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.splunk.basicPropertyBinding": {
-			"name": "camel.component.splunk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.splunk.autowiredEnabled": {
+			"name": "camel.component.splunk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.splunk.splunkConfigurationFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-source.json
index 6784f5e..57f1d9b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-source.json
@@ -130,13 +130,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -270,11 +263,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.splunk.basicPropertyBinding": {
-			"name": "camel.component.splunk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.splunk.autowiredEnabled": {
+			"name": "camel.component.splunk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.splunk.splunkConfigurationFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-batch-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-batch-sink.json
index bbfba6e..b740e27 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-batch-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-batch-sink.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -74,11 +67,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-batch.basicPropertyBinding": {
-			"name": "camel.component.spring-batch.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-batch.autowiredEnabled": {
+			"name": "camel.component.spring-batch.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-sink.json
index a03ecdb..4db65b0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-event.basicPropertyBinding": {
-			"name": "camel.component.spring-event.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-event.autowiredEnabled": {
+			"name": "camel.component.spring-event.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-source.json
index f87d40d..21bf601 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-source.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -55,11 +48,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-event.basicPropertyBinding": {
-			"name": "camel.component.spring-event.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-event.autowiredEnabled": {
+			"name": "camel.component.spring-event.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-sink.json
index 1a77ba4..3fdcc13 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-sink.json
@@ -35,13 +35,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -56,11 +49,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-integration.basicPropertyBinding": {
-			"name": "camel.component.spring-integration.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-integration.autowiredEnabled": {
+			"name": "camel.component.spring-integration.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-source.json
index aa047e5..0d462fd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-source.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -68,11 +61,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-integration.basicPropertyBinding": {
-			"name": "camel.component.spring-integration.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-integration.autowiredEnabled": {
+			"name": "camel.component.spring-integration.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ldap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ldap-sink.json
index 8516168..02b916f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ldap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ldap-sink.json
@@ -35,13 +35,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -56,11 +49,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-ldap.basicPropertyBinding": {
-			"name": "camel.component.spring-ldap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-ldap.autowiredEnabled": {
+			"name": "camel.component.spring-ldap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-sink.json
index 478dc35..8d9298f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -80,11 +73,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-redis.basicPropertyBinding": {
-			"name": "camel.component.spring-redis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-redis.autowiredEnabled": {
+			"name": "camel.component.spring-redis.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-source.json
index 7fd32e6..42d91a5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-source.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-redis.basicPropertyBinding": {
-			"name": "camel.component.spring-redis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-redis.autowiredEnabled": {
+			"name": "camel.component.spring-redis.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-sink.json
index 38181ef..afb5d96 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-sink.json
@@ -108,13 +108,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -135,11 +128,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-ws.basicPropertyBinding": {
-			"name": "camel.component.spring-ws.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-ws.autowiredEnabled": {
+			"name": "camel.component.spring-ws.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.spring-ws.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-source.json
index c168014..69b4616 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-source.json
@@ -70,13 +70,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -97,11 +90,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-ws.basicPropertyBinding": {
-			"name": "camel.component.spring-ws.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-ws.autowiredEnabled": {
+			"name": "camel.component.spring-ws.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.spring-ws.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-sink.json
index f35d3a5..6401a8c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-sink.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.parametersCount": {
 			"name": "camel.sink.endpoint.parametersCount",
 			"description": "If set greater than zero, then Camel will use this count value of parameters to replace instead of querying via JDBC metadata API. This is useful if the JDBC vendor could not return correct parameters count, then user may override instead.",
@@ -154,11 +147,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sql.basicPropertyBinding": {
-			"name": "camel.component.sql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sql.autowiredEnabled": {
+			"name": "camel.component.sql.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sql.usePlaceholder": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-source.json
index 0026b0e..4639366 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-source.json
@@ -164,13 +164,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.parametersCount": {
 			"name": "camel.source.endpoint.parametersCount",
 			"description": "If set greater than zero, then Camel will use this count value of parameters to replace instead of querying via JDBC metadata API. This is useful if the JDBC vendor could not return correct parameters count, then user may override instead.",
@@ -316,11 +309,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sql.basicPropertyBinding": {
-			"name": "camel.component.sql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sql.autowiredEnabled": {
+			"name": "camel.component.sql.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sql.usePlaceholder": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-stored-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-stored-sink.json
index 35b2bb6..c7f7d7a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-stored-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-stored-sink.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -89,11 +82,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sql-stored.basicPropertyBinding": {
-			"name": "camel.component.sql-stored.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sql-stored.autowiredEnabled": {
+			"name": "camel.component.sql-stored.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-sink.json
index 116322d..b603f58 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-sink.json
@@ -49,13 +49,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.channelType": {
 			"name": "camel.sink.endpoint.channelType",
 			"description": "Sets the channel type to pass to the Channel as part of command execution. Defaults to exec.",
@@ -146,11 +139,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ssh.basicPropertyBinding": {
-			"name": "camel.component.ssh.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ssh.autowiredEnabled": {
+			"name": "camel.component.ssh.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ssh.channelType": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json
index 524b915..7ce72c9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json
@@ -80,13 +80,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.channelType": {
 			"name": "camel.source.endpoint.channelType",
 			"description": "Sets the channel type to pass to the Channel as part of command execution. Defaults to exec.",
@@ -276,11 +269,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ssh.basicPropertyBinding": {
-			"name": "camel.component.ssh.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ssh.autowiredEnabled": {
+			"name": "camel.component.ssh.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ssh.channelType": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stax-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stax-sink.json
index dfb4d82..2e225c4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stax-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stax-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stax.basicPropertyBinding": {
-			"name": "camel.component.stax.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stax.autowiredEnabled": {
+			"name": "camel.component.stax.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-sink.json
index 4f995c8..ea05c93 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -117,11 +110,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stomp.basicPropertyBinding": {
-			"name": "camel.component.stomp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stomp.autowiredEnabled": {
+			"name": "camel.component.stomp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.stomp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-source.json
index 2a0f2ab..9b11659 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-source.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stomp.basicPropertyBinding": {
-			"name": "camel.component.stomp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stomp.autowiredEnabled": {
+			"name": "camel.component.stomp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.stomp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-sink.json
index 382f981..645a855 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-sink.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.readTimeout": {
 			"name": "camel.sink.endpoint.readTimeout",
 			"description": "Sets the read timeout to a specified timeout, in milliseconds. A non-zero value specifies the timeout when reading from Input stream when a connection is established to a resource. If the timeout expires before there is data available for read, a java.net.SocketTimeoutException is raised. A timeout of zero is interpreted as an infinite timeout.",
@@ -80,11 +73,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stream.basicPropertyBinding": {
-			"name": "camel.component.stream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stream.autowiredEnabled": {
+			"name": "camel.component.stream.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-source.json
index c6e9faf..18e3ccb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-source.json
@@ -104,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.readTimeout": {
 			"name": "camel.source.endpoint.readTimeout",
 			"description": "Sets the read timeout to a specified timeout, in milliseconds. A non-zero value specifies the timeout when reading from Input stream when a connection is established to a resource. If the timeout expires before there is data available for read, a java.net.SocketTimeoutException is raised. A timeout of zero is interpreted as an infinite timeout.",
@@ -131,11 +124,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stream.basicPropertyBinding": {
-			"name": "camel.component.stream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stream.autowiredEnabled": {
+			"name": "camel.component.stream.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-string-template-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-string-template-sink.json
index 9ad74d7..5ba661d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-string-template-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-string-template-sink.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.string-template.basicPropertyBinding": {
-			"name": "camel.component.string-template.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.string-template.autowiredEnabled": {
+			"name": "camel.component.string-template.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-sink.json
index 61c678f..a96989d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.queue": {
 			"name": "camel.sink.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -124,11 +117,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stub.basicPropertyBinding": {
-			"name": "camel.component.stub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stub.autowiredEnabled": {
+			"name": "camel.component.stub.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.stub.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-source.json
index bc5d0d0..60194ca 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-source.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.queue": {
 			"name": "camel.source.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stub.basicPropertyBinding": {
-			"name": "camel.component.stub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stub.autowiredEnabled": {
+			"name": "camel.component.stub.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.stub.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-sink.json
index 65b14bb..06ffe3a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "The initial in-memory buffer size used when transferring data between Camel and AHC Client.",
@@ -93,6 +86,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.telegram.autowiredEnabled": {
+			"name": "camel.component.telegram.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.telegram.baseUri": {
 			"name": "camel.component.telegram.baseUri",
 			"description": "Can be used to set an alternative base URI, e.g. when you want to test the component against a mock Telegram API",
@@ -100,13 +100,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.telegram.basicPropertyBinding": {
-			"name": "camel.component.telegram.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
-			"required": "false"
-		},
 		"camel.component.telegram.client": {
 			"name": "camel.component.telegram.client",
 			"description": "To use a custom AsyncHttpClient",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-source.json
index 1a8eb7f..8e28cbb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-source.json
@@ -67,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bufferSize": {
 			"name": "camel.source.endpoint.bufferSize",
 			"description": "The initial in-memory buffer size used when transferring data between Camel and AHC Client.",
@@ -219,6 +212,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.telegram.autowiredEnabled": {
+			"name": "camel.component.telegram.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.telegram.baseUri": {
 			"name": "camel.component.telegram.baseUri",
 			"description": "Can be used to set an alternative base URI, e.g. when you want to test the component against a mock Telegram API",
@@ -226,13 +226,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.telegram.basicPropertyBinding": {
-			"name": "camel.component.telegram.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
-			"required": "false"
-		},
 		"camel.component.telegram.client": {
 			"name": "camel.component.telegram.client",
 			"description": "To use a custom AsyncHttpClient",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-sink.json
index da182d4..de612b6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-sink.json
@@ -54,13 +54,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -88,11 +81,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.thrift.basicPropertyBinding": {
-			"name": "camel.component.thrift.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.thrift.autowiredEnabled": {
+			"name": "camel.component.thrift.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.thrift.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-source.json
index c13a210..5424c51 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-source.json
@@ -80,13 +80,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -114,11 +107,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.thrift.basicPropertyBinding": {
-			"name": "camel.component.thrift.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.thrift.autowiredEnabled": {
+			"name": "camel.component.thrift.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.thrift.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-tika-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-tika-sink.json
index adbcd54..97fce81 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-tika-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-tika-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -68,11 +61,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.tika.basicPropertyBinding": {
-			"name": "camel.component.tika.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.tika.autowiredEnabled": {
+			"name": "camel.component.tika.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-timer-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-timer-source.json
index d5fe76e..e10514b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-timer-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-timer-source.json
@@ -69,13 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.daemon": {
 			"name": "camel.source.endpoint.daemon",
 			"description": "Specifies whether or not the thread associated with the timer endpoint runs as a daemon. The default value is true.",
@@ -115,11 +108,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.timer.basicPropertyBinding": {
-			"name": "camel.component.timer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.timer.autowiredEnabled": {
+			"name": "camel.component.timer.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-sink.json
index 76a3b70..efd7909 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twilio.basicPropertyBinding": {
-			"name": "camel.component.twilio.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twilio.autowiredEnabled": {
+			"name": "camel.component.twilio.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twilio.restClient": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-source.json
index 76e1d7a..510d4a3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-source.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -179,11 +172,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twilio.basicPropertyBinding": {
-			"name": "camel.component.twilio.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twilio.autowiredEnabled": {
+			"name": "camel.component.twilio.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twilio.restClient": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-sink.json
index 7a12455..634082d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-directmessage.basicPropertyBinding": {
-			"name": "camel.component.twitter-directmessage.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-directmessage.autowiredEnabled": {
+			"name": "camel.component.twitter-directmessage.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-directmessage.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-source.json
index 885f231..e0b196c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-source.json
@@ -92,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -301,11 +294,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-directmessage.basicPropertyBinding": {
-			"name": "camel.component.twitter-directmessage.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-directmessage.autowiredEnabled": {
+			"name": "camel.component.twitter-directmessage.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-directmessage.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-sink.json
index fb73df2..79cffe0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-search.basicPropertyBinding": {
-			"name": "camel.component.twitter-search.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-search.autowiredEnabled": {
+			"name": "camel.component.twitter-search.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-search.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-source.json
index 8cd3f9f..4b15427 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-source.json
@@ -92,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -301,11 +294,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-search.basicPropertyBinding": {
-			"name": "camel.component.twitter-search.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-search.autowiredEnabled": {
+			"name": "camel.component.twitter-search.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-search.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-sink.json
index 96498d5..0089c6e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -97,11 +90,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-timeline.basicPropertyBinding": {
-			"name": "camel.component.twitter-timeline.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-timeline.autowiredEnabled": {
+			"name": "camel.component.twitter-timeline.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-timeline.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-source.json
index 1725485..88a5b8c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-source.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -307,11 +300,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-timeline.basicPropertyBinding": {
-			"name": "camel.component.twitter-timeline.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-timeline.autowiredEnabled": {
+			"name": "camel.component.twitter-timeline.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-timeline.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-sink.json
index 8705961..f31c59c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-sink.json
@@ -89,13 +89,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -159,11 +152,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.undertow.basicPropertyBinding": {
-			"name": "camel.component.undertow.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.undertow.autowiredEnabled": {
+			"name": "camel.component.undertow.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.undertow.hostOptions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-source.json
index 115124a..e055678 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-source.json
@@ -87,13 +87,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.undertow.basicPropertyBinding": {
-			"name": "camel.component.undertow.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.undertow.autowiredEnabled": {
+			"name": "camel.component.undertow.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.undertow.hostOptions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-validator-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-validator-sink.json
index 872a152..7e37ba2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-validator-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-validator-sink.json
@@ -42,13 +42,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.errorHandler": {
 			"name": "camel.sink.endpoint.errorHandler",
 			"description": "To use a custom org.apache.camel.processor.validation.ValidatorErrorHandler. The default error handler captures the errors and throws an exception.",
@@ -101,11 +94,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.validator.basicPropertyBinding": {
-			"name": "camel.component.validator.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.validator.autowiredEnabled": {
+			"name": "camel.component.validator.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.validator.resourceResolverFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-velocity-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-velocity-sink.json
index 34dff21..81cf1fc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-velocity-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-velocity-sink.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -97,11 +90,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.velocity.basicPropertyBinding": {
-			"name": "camel.component.velocity.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.velocity.autowiredEnabled": {
+			"name": "camel.component.velocity.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.velocity.velocityEngine": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json
index 14647ad..42f2722 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json
@@ -103,13 +103,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -185,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx-http.basicPropertyBinding": {
-			"name": "camel.component.vertx-http.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx-http.autowiredEnabled": {
+			"name": "camel.component.vertx-http.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx-http.vertx": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-sink.json
index 414fc20..b7644f6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -80,11 +73,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx.basicPropertyBinding": {
-			"name": "camel.component.vertx.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx.autowiredEnabled": {
+			"name": "camel.component.vertx.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx.vertxFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-source.json
index f9c4cf0..70f8343 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-source.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx.basicPropertyBinding": {
-			"name": "camel.component.vertx.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx.autowiredEnabled": {
+			"name": "camel.component.vertx.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx.vertxFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
index e1bc267..9da5a2b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
@@ -56,13 +56,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -83,11 +76,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx-websocket.basicPropertyBinding": {
-			"name": "camel.component.vertx-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx-websocket.autowiredEnabled": {
+			"name": "camel.component.vertx-websocket.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx-websocket.router": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-source.json
index 8838c85..f5e6be9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-source.json
@@ -67,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx-websocket.basicPropertyBinding": {
-			"name": "camel.component.vertx-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx-websocket.autowiredEnabled": {
+			"name": "camel.component.vertx-websocket.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx-websocket.router": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-sink.json
index 2a5838b..b950983 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.queue": {
 			"name": "camel.sink.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -124,11 +117,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vm.basicPropertyBinding": {
-			"name": "camel.component.vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vm.autowiredEnabled": {
+			"name": "camel.component.vm.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vm.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-source.json
index e3dfec7..5076ed2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-source.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.queue": {
 			"name": "camel.source.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vm.basicPropertyBinding": {
-			"name": "camel.component.vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vm.autowiredEnabled": {
+			"name": "camel.component.vm.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vm.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-sink.json
index c6e55eb..6a238e1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.geoLocationProvider": {
 			"name": "camel.sink.endpoint.geoLocationProvider",
 			"description": "A custum geolocation provider to determine the longitude and latitude to use when no location information is set. The default implementaion uses the ipstack API and requires geolocationAccessKey and geolocationRequestHostIP",
@@ -165,11 +158,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.weather.basicPropertyBinding": {
-			"name": "camel.component.weather.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.weather.autowiredEnabled": {
+			"name": "camel.component.weather.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-source.json
index a21f9e3..d1fb6c0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-source.json
@@ -91,13 +91,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.geoLocationProvider": {
 			"name": "camel.source.endpoint.geoLocationProvider",
 			"description": "A custum geolocation provider to determine the longitude and latitude to use when no location information is set. The default implementaion uses the ipstack API and requires geolocationAccessKey and geolocationRequestHostIP",
@@ -283,11 +276,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.weather.basicPropertyBinding": {
-			"name": "camel.component.weather.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.weather.autowiredEnabled": {
+			"name": "camel.component.weather.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-sink.json
index c151895..a3068a0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-sink.json
@@ -232,13 +232,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -469,11 +462,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.web3j.basicPropertyBinding": {
-			"name": "camel.component.web3j.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.web3j.autowiredEnabled": {
+			"name": "camel.component.web3j.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-source.json
index deb58d1..5ea34cd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-source.json
@@ -104,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -201,11 +194,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.web3j.basicPropertyBinding": {
-			"name": "camel.component.web3j.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.web3j.autowiredEnabled": {
+			"name": "camel.component.web3j.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-webhook-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-webhook-source.json
index 1a65805..df83565 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-webhook-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-webhook-source.json
@@ -65,13 +65,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -117,11 +110,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.webhook.basicPropertyBinding": {
-			"name": "camel.component.webhook.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.webhook.autowiredEnabled": {
+			"name": "camel.component.webhook.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.webhook.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-sink.json
index 50c6d0c..7e8e7ea 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-sink.json
@@ -29,13 +29,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -50,11 +43,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.websocket-jsr356.basicPropertyBinding": {
-			"name": "camel.component.websocket-jsr356.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.websocket-jsr356.autowiredEnabled": {
+			"name": "camel.component.websocket-jsr356.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.websocket-jsr356.serverEndpointDeploymentStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-source.json
index 4619f49..59d73b4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-source.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -62,11 +55,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.websocket-jsr356.basicPropertyBinding": {
-			"name": "camel.component.websocket-jsr356.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.websocket-jsr356.autowiredEnabled": {
+			"name": "camel.component.websocket-jsr356.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.websocket-jsr356.serverEndpointDeploymentStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-sink.json
index 80713af..059e3ce 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-sink.json
@@ -56,13 +56,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "Set the buffer size of the websocketServlet, which is also the max frame byte size (default 8192)",
@@ -150,11 +143,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.websocket.basicPropertyBinding": {
-			"name": "camel.component.websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.websocket.autowiredEnabled": {
+			"name": "camel.component.websocket.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.websocket.enableJmx": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-source.json
index b6b8aaa..4ebf7b4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-source.json
@@ -68,13 +68,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bufferSize": {
 			"name": "camel.source.endpoint.bufferSize",
 			"description": "Set the buffer size of the websocketServlet, which is also the max frame byte size (default 8192)",
@@ -168,11 +161,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.websocket.basicPropertyBinding": {
-			"name": "camel.component.websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.websocket.autowiredEnabled": {
+			"name": "camel.component.websocket.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.websocket.enableJmx": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weka-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weka-sink.json
index 03bc98f..74c1808 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weka-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weka-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -100,11 +93,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.weka.basicPropertyBinding": {
-			"name": "camel.component.weka.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.weka.autowiredEnabled": {
+			"name": "camel.component.weka.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-sink.json
index b60bd00..e9d214d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -155,11 +148,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.wordpress.basicPropertyBinding": {
-			"name": "camel.component.wordpress.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.wordpress.autowiredEnabled": {
+			"name": "camel.component.wordpress.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-source.json
index 597d35d..09a3494 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-source.json
@@ -90,13 +90,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -167,11 +160,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.wordpress.basicPropertyBinding": {
-			"name": "camel.component.wordpress.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.wordpress.autowiredEnabled": {
+			"name": "camel.component.wordpress.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 7316923..9b381c5 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -60,7 +60,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SinkConnector", model.getConnectorClass());
         assertEquals("camel.sink.path.bucketNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonS3Client", model.getOptions().get(1).getName());
-        assertEquals("camel.sink.endpoint.amazonS3Presigner", model.getOptions().get(2).getName());
+        assertEquals("camel.sink.endpoint.autoCreateBucket", model.getOptions().get(2).getName());
         assertEquals(1, model.getConverters().size());
         assertEquals(1, model.getTransforms().size());
         assertNull(model.getAggregationStrategies());


[camel-kafka-connector] 17/21: Regen and fixed compilation

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 099f56e1f0319e87b7c6455e71e86f6594cfd409
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 24 07:24:37 2020 +0100

    Regen and fixed compilation
---
 .../generated/resources/camel-aws2-s3-sink.json    | 24 ++++++++++++++++------
 .../generated/resources/camel-aws2-s3-source.json  | 24 ++++++++++++++++------
 .../docs/camel-aws2-s3-kafka-sink-connector.adoc   |  8 +++++---
 .../docs/camel-aws2-s3-kafka-source-connector.adoc |  8 +++++---
 .../aws2s3/CamelAws2s3SinkConnectorConfig.java     | 24 ++++++++++++++--------
 .../aws2s3/CamelAws2s3SourceConnectorConfig.java   | 24 ++++++++++++++--------
 .../generated/resources/camel-aws2-sns-sink.json   |  8 ++++----
 .../docs/camel-aws2-sns-kafka-sink-connector.adoc  |  4 ++--
 .../aws2sns/CamelAws2snsSinkConnectorConfig.java   | 16 +++++++--------
 .../generated/resources/camel-aws2-sqs-sink.json   |  8 ++++----
 .../generated/resources/camel-aws2-sqs-source.json |  8 ++++----
 .../docs/camel-aws2-sqs-kafka-sink-connector.adoc  |  4 ++--
 .../camel-aws2-sqs-kafka-source-connector.adoc     |  4 ++--
 .../aws2sqs/CamelAws2sqsSinkConnectorConfig.java   | 16 +++++++--------
 .../aws2sqs/CamelAws2sqsSourceConnectorConfig.java | 16 +++++++--------
 .../generated/resources/camel-graphql-sink.json    |  7 +++++++
 .../docs/camel-graphql-kafka-sink-connector.adoc   |  3 ++-
 .../graphql/CamelGraphqlSinkConnectorConfig.java   |  4 ++++
 .../generated/resources/camel-salesforce-sink.json |  4 ++--
 .../resources/camel-salesforce-source.json         |  4 ++--
 .../camel-salesforce-kafka-sink-connector.adoc     |  4 ++--
 .../camel-salesforce-kafka-source-connector.adoc   |  4 ++--
 .../CamelSalesforceSinkConnectorConfig.java        |  4 ++--
 .../CamelSalesforceSourceConnectorConfig.java      |  4 ++--
 .../SourcePojoToSchemaAndStructTransformTest.java  |  8 +++++---
 .../camel-aws2-s3-kafka-sink-connector.adoc        |  8 +++++---
 .../camel-aws2-s3-kafka-source-connector.adoc      |  8 +++++---
 .../camel-aws2-sns-kafka-sink-connector.adoc       |  4 ++--
 .../camel-aws2-sqs-kafka-sink-connector.adoc       |  4 ++--
 .../camel-aws2-sqs-kafka-source-connector.adoc     |  4 ++--
 .../camel-graphql-kafka-sink-connector.adoc        |  3 ++-
 .../camel-salesforce-kafka-sink-connector.adoc     |  4 ++--
 .../camel-salesforce-kafka-source-connector.adoc   |  4 ++--
 33 files changed, 172 insertions(+), 109 deletions(-)

diff --git a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json
index 498bb23..f3ac579 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json
+++ b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json
@@ -21,6 +21,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.amazonS3Presigner": {
+			"name": "camel.sink.endpoint.amazonS3Presigner",
+			"description": "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.autoCreateBucket": {
 			"name": "camel.sink.endpoint.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
@@ -86,9 +92,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.useIAMCredentials": {
-			"name": "camel.sink.endpoint.useIAMCredentials",
-			"description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
+		"camel.sink.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -202,6 +208,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-s3.amazonS3Presigner": {
+			"name": "camel.component.aws2-s3.amazonS3Presigner",
+			"description": "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-s3.autoCreateBucket": {
 			"name": "camel.component.aws2-s3.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
@@ -273,9 +285,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.useIAMCredentials": {
-			"name": "camel.component.aws2-s3.useIAMCredentials",
-			"description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
+		"camel.component.aws2-s3.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-s3.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json
index b79d280..6233e34 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json
+++ b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json
@@ -21,6 +21,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.amazonS3Presigner": {
+			"name": "camel.source.endpoint.amazonS3Presigner",
+			"description": "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.autoCreateBucket": {
 			"name": "camel.source.endpoint.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
@@ -86,9 +92,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.useIAMCredentials": {
-			"name": "camel.source.endpoint.useIAMCredentials",
-			"description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
+		"camel.source.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.source.endpoint.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -346,6 +352,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-s3.amazonS3Presigner": {
+			"name": "camel.component.aws2-s3.amazonS3Presigner",
+			"description": "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-s3.autoCreateBucket": {
 			"name": "camel.component.aws2-s3.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
@@ -417,9 +429,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.useIAMCredentials": {
-			"name": "camel.component.aws2-s3.useIAMCredentials",
-			"description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
+		"camel.component.aws2-s3.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-s3.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc
index ffe0bd0..18a7c1a 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SinkConnector
 ----
 
 
-The camel-aws2-s3 sink connector supports 58 options, which are listed below.
+The camel-aws2-s3 sink connector supports 60 options, which are listed below.
 
 
 
@@ -31,6 +31,7 @@ The camel-aws2-s3 sink connector supports 58 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.bucketNameOrArn* | Bucket name or ARN | null | true | HIGH
 | *camel.sink.endpoint.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
+| *camel.sink.endpoint.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
 | *camel.sink.endpoint.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
 | *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
@@ -41,7 +42,7 @@ The camel-aws2-s3 sink connector supports 58 options, which are listed below.
 | *camel.sink.endpoint.region* | The region in which S3 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
-| *camel.sink.endpoint.useIAMCredentials* | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.sink.endpoint.useDefaultCredentialsProvider* | Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.sink.endpoint.customerAlgorithm* | Define the customer algorithm to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.sink.endpoint.customerKeyId* | Define the id of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.sink.endpoint.customerKeyMD5* | Define the MD5 of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
@@ -59,6 +60,7 @@ The camel-aws2-s3 sink connector supports 58 options, which are listed below.
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-s3.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
+| *camel.component.aws2-s3.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
 | *camel.component.aws2-s3.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
 | *camel.component.aws2-s3.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-s3.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
@@ -70,7 +72,7 @@ The camel-aws2-s3 sink connector supports 58 options, which are listed below.
 | *camel.component.aws2-s3.region* | The region in which S3 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-s3.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.component.aws2-s3.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
-| *camel.component.aws2-s3.useIAMCredentials* | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.component.aws2-s3.useDefaultCredentials Provider* | Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-s3.customerAlgorithm* | Define the customer algorithm to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.component.aws2-s3.customerKeyId* | Define the id of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.component.aws2-s3.customerKeyMD5* | Define the MD5 of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc
index 0c67013..466b485 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SourceConnecto
 ----
 
 
-The camel-aws2-s3 source connector supports 82 options, which are listed below.
+The camel-aws2-s3 source connector supports 84 options, which are listed below.
 
 
 
@@ -31,6 +31,7 @@ The camel-aws2-s3 source connector supports 82 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.source.path.bucketNameOrArn* | Bucket name or ARN | null | true | HIGH
 | *camel.source.endpoint.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
+| *camel.source.endpoint.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
 | *camel.source.endpoint.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
 | *camel.source.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.source.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
@@ -41,7 +42,7 @@ The camel-aws2-s3 source connector supports 82 options, which are listed below.
 | *camel.source.endpoint.region* | The region in which S3 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.source.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.source.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
-| *camel.source.endpoint.useIAMCredentials* | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.source.endpoint.useDefaultCredentials Provider* | Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.source.endpoint.customerAlgorithm* | Define the customer algorithm to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.source.endpoint.customerKeyId* | Define the id of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.source.endpoint.customerKeyMD5* | Define the MD5 of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
@@ -81,6 +82,7 @@ The camel-aws2-s3 source connector supports 82 options, which are listed below.
 | *camel.source.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.source.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-s3.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
+| *camel.component.aws2-s3.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
 | *camel.component.aws2-s3.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
 | *camel.component.aws2-s3.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-s3.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
@@ -92,7 +94,7 @@ The camel-aws2-s3 source connector supports 82 options, which are listed below.
 | *camel.component.aws2-s3.region* | The region in which S3 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-s3.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.component.aws2-s3.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
-| *camel.component.aws2-s3.useIAMCredentials* | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.component.aws2-s3.useDefaultCredentials Provider* | Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-s3.customerAlgorithm* | Define the customer algorithm to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.component.aws2-s3.customerKeyId* | Define the id of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.component.aws2-s3.customerKeyMD5* | Define the MD5 of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SinkConnectorConfig.java b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SinkConnectorConfig.java
index a764431..4a09e94 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SinkConnectorConfig.java
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SinkConnectorConfig.java
@@ -30,6 +30,9 @@ public class CamelAws2s3SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3CLIENT_CONF = "camel.sink.endpoint.amazonS3Client";
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3CLIENT_DOC = "Reference to a com.amazonaws.services.s3.AmazonS3 in the registry.";
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3CLIENT_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_CONF = "camel.sink.endpoint.amazonS3Presigner";
+    public static final String CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_DOC = "An S3 Presigner for Request, used mainly in createDownloadLink operation";
+    public static final String CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_CONF = "camel.sink.endpoint.autoCreateBucket";
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.";
     public static final Boolean CAMEL_SINK_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT = true;
@@ -60,9 +63,9 @@ public class CamelAws2s3SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.sink.endpoint.uriEndpointOverride";
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2S3_ENDPOINT_USE_IAMCREDENTIALS_CONF = "camel.sink.endpoint.useIAMCredentials";
-    public static final String CAMEL_SINK_AWS2S3_ENDPOINT_USE_IAMCREDENTIALS_DOC = "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.";
-    public static final Boolean CAMEL_SINK_AWS2S3_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2S3_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.sink.endpoint.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWS2S3_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWS2S3_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_CUSTOMER_ALGORITHM_CONF = "camel.sink.endpoint.customerAlgorithm";
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_CUSTOMER_ALGORITHM_DOC = "Define the customer algorithm to use in case CustomerKey is enabled";
     public static final String CAMEL_SINK_AWS2S3_ENDPOINT_CUSTOMER_ALGORITHM_DEFAULT = null;
@@ -114,6 +117,9 @@ public class CamelAws2s3SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3CLIENT_CONF = "camel.component.aws2-s3.amazonS3Client";
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3CLIENT_DOC = "Reference to a com.amazonaws.services.s3.AmazonS3 in the registry.";
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3CLIENT_DEFAULT = null;
+    public static final String CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_CONF = "camel.component.aws2-s3.amazonS3Presigner";
+    public static final String CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_DOC = "An S3 Presigner for Request, used mainly in createDownloadLink operation";
+    public static final String CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_DEFAULT = null;
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_CONF = "camel.component.aws2-s3.autoCreateBucket";
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.";
     public static final Boolean CAMEL_SINK_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DEFAULT = true;
@@ -147,9 +153,9 @@ public class CamelAws2s3SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-s3.uriEndpointOverride";
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2S3_COMPONENT_USE_IAMCREDENTIALS_CONF = "camel.component.aws2-s3.useIAMCredentials";
-    public static final String CAMEL_SINK_AWS2S3_COMPONENT_USE_IAMCREDENTIALS_DOC = "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.";
-    public static final Boolean CAMEL_SINK_AWS2S3_COMPONENT_USE_IAMCREDENTIALS_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2S3_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.component.aws2-s3.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWS2S3_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWS2S3_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_CUSTOMER_ALGORITHM_CONF = "camel.component.aws2-s3.customerAlgorithm";
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_CUSTOMER_ALGORITHM_DOC = "Define the customer algorithm to use in case CustomerKey is enabled";
     public static final String CAMEL_SINK_AWS2S3_COMPONENT_CUSTOMER_ALGORITHM_DEFAULT = null;
@@ -213,6 +219,7 @@ public class CamelAws2s3SinkConnectorConfig extends CamelSinkConnectorConfig {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWS2S3_PATH_BUCKET_NAME_OR_ARN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_PATH_BUCKET_NAME_OR_ARN_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2S3_PATH_BUCKET_NAME_OR_ARN_DOC);
         conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3CLIENT_DOC);
+        conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_DOC);
         conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DOC);
         conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2S3_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2S3_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_POJO_REQUEST_DOC);
@@ -223,7 +230,7 @@ public class CamelAws2s3SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2S3_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
-        conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2S3_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_USE_IAMCREDENTIALS_DOC);
+        conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2S3_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_CUSTOMER_ALGORITHM_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_ENDPOINT_CUSTOMER_ALGORITHM_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_CUSTOMER_ALGORITHM_DOC);
         conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_CUSTOMER_KEY_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_ENDPOINT_CUSTOMER_KEY_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_CUSTOMER_KEY_ID_DOC);
         conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_CUSTOMER_KEY_MD5CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_ENDPOINT_CUSTOMER_KEY_MD5DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_CUSTOMER_KEY_MD5DOC);
@@ -241,6 +248,7 @@ public class CamelAws2s3SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2S3_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3CLIENT_DOC);
+        conf.define(CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_DOC);
         conf.define(CAMEL_SINK_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DOC);
         conf.define(CAMEL_SINK_AWS2S3_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2S3_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2S3_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_OVERRIDE_ENDPOINT_DOC);
@@ -252,7 +260,7 @@ public class CamelAws2s3SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2S3_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2S3_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2S3_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SINK_AWS2S3_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
-        conf.define(CAMEL_SINK_AWS2S3_COMPONENT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2S3_COMPONENT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_USE_IAMCREDENTIALS_DOC);
+        conf.define(CAMEL_SINK_AWS2S3_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2S3_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SINK_AWS2S3_COMPONENT_CUSTOMER_ALGORITHM_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_COMPONENT_CUSTOMER_ALGORITHM_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_CUSTOMER_ALGORITHM_DOC);
         conf.define(CAMEL_SINK_AWS2S3_COMPONENT_CUSTOMER_KEY_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_COMPONENT_CUSTOMER_KEY_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_CUSTOMER_KEY_ID_DOC);
         conf.define(CAMEL_SINK_AWS2S3_COMPONENT_CUSTOMER_KEY_MD5CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2S3_COMPONENT_CUSTOMER_KEY_MD5DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2S3_COMPONENT_CUSTOMER_KEY_MD5DOC);
diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java
index afd7b97..a881ba4 100644
--- a/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java
+++ b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java
@@ -32,6 +32,9 @@ public class CamelAws2s3SourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3CLIENT_CONF = "camel.source.endpoint.amazonS3Client";
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3CLIENT_DOC = "Reference to a com.amazonaws.services.s3.AmazonS3 in the registry.";
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3CLIENT_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_CONF = "camel.source.endpoint.amazonS3Presigner";
+    public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_DOC = "An S3 Presigner for Request, used mainly in createDownloadLink operation";
+    public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_CONF = "camel.source.endpoint.autoCreateBucket";
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.";
     public static final Boolean CAMEL_SOURCE_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT = true;
@@ -62,9 +65,9 @@ public class CamelAws2s3SourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF = "camel.source.endpoint.uriEndpointOverride";
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_USE_IAMCREDENTIALS_CONF = "camel.source.endpoint.useIAMCredentials";
-    public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_USE_IAMCREDENTIALS_DOC = "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.";
-    public static final Boolean CAMEL_SOURCE_AWS2S3_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.source.endpoint.useDefaultCredentialsProvider";
+    public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SOURCE_AWS2S3_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_CUSTOMER_ALGORITHM_CONF = "camel.source.endpoint.customerAlgorithm";
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_CUSTOMER_ALGORITHM_DOC = "Define the customer algorithm to use in case CustomerKey is enabled";
     public static final String CAMEL_SOURCE_AWS2S3_ENDPOINT_CUSTOMER_ALGORITHM_DEFAULT = null;
@@ -182,6 +185,9 @@ public class CamelAws2s3SourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3CLIENT_CONF = "camel.component.aws2-s3.amazonS3Client";
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3CLIENT_DOC = "Reference to a com.amazonaws.services.s3.AmazonS3 in the registry.";
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3CLIENT_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_CONF = "camel.component.aws2-s3.amazonS3Presigner";
+    public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_DOC = "An S3 Presigner for Request, used mainly in createDownloadLink operation";
+    public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_DEFAULT = null;
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_CONF = "camel.component.aws2-s3.autoCreateBucket";
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DOC = "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.";
     public static final Boolean CAMEL_SOURCE_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DEFAULT = true;
@@ -215,9 +221,9 @@ public class CamelAws2s3SourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF = "camel.component.aws2-s3.uriEndpointOverride";
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC = "Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option";
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_USE_IAMCREDENTIALS_CONF = "camel.component.aws2-s3.useIAMCredentials";
-    public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_USE_IAMCREDENTIALS_DOC = "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.";
-    public static final Boolean CAMEL_SOURCE_AWS2S3_COMPONENT_USE_IAMCREDENTIALS_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.component.aws2-s3.useDefaultCredentialsProvider";
+    public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SOURCE_AWS2S3_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_CUSTOMER_ALGORITHM_CONF = "camel.component.aws2-s3.customerAlgorithm";
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_CUSTOMER_ALGORITHM_DOC = "Define the customer algorithm to use in case CustomerKey is enabled";
     public static final String CAMEL_SOURCE_AWS2S3_COMPONENT_CUSTOMER_ALGORITHM_DEFAULT = null;
@@ -287,6 +293,7 @@ public class CamelAws2s3SourceConnectorConfig
         ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
         conf.define(CAMEL_SOURCE_AWS2S3_PATH_BUCKET_NAME_OR_ARN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_PATH_BUCKET_NAME_OR_ARN_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_AWS2S3_PATH_BUCKET_NAME_OR_ARN_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3CLIENT_DOC);
+        conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_AMAZON_S3PRESIGNER_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_AUTO_CREATE_BUCKET_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_ENDPOINT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_OVERRIDE_ENDPOINT_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_POJO_REQUEST_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_ENDPOINT_POJO_REQUEST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_POJO_REQUEST_DOC);
@@ -297,7 +304,7 @@ public class CamelAws2s3SourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_URI_ENDPOINT_OVERRIDE_DOC);
-        conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_USE_IAMCREDENTIALS_DOC);
+        conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_CUSTOMER_ALGORITHM_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_CUSTOMER_ALGORITHM_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_CUSTOMER_ALGORITHM_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_CUSTOMER_KEY_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_CUSTOMER_KEY_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_CUSTOMER_KEY_ID_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_CUSTOMER_KEY_MD5CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_CUSTOMER_KEY_MD5DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_CUSTOMER_KEY_MD5DOC);
@@ -337,6 +344,7 @@ public class CamelAws2s3SourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3CLIENT_DOC);
+        conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_AMAZON_S3PRESIGNER_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_AUTO_CREATE_BUCKET_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_OVERRIDE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_COMPONENT_OVERRIDE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_OVERRIDE_ENDPOINT_DOC);
@@ -348,7 +356,7 @@ public class CamelAws2s3SourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_URI_ENDPOINT_OVERRIDE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_URI_ENDPOINT_OVERRIDE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_URI_ENDPOINT_OVERRIDE_DOC);
-        conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_COMPONENT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_USE_IAMCREDENTIALS_DOC);
+        conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2S3_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_CUSTOMER_ALGORITHM_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_CUSTOMER_ALGORITHM_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_CUSTOMER_ALGORITHM_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_CUSTOMER_KEY_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_CUSTOMER_KEY_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_CUSTOMER_KEY_ID_DOC);
         conf.define(CAMEL_SOURCE_AWS2S3_COMPONENT_CUSTOMER_KEY_MD5CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2S3_COMPONENT_CUSTOMER_KEY_MD5DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2S3_COMPONENT_CUSTOMER_KEY_MD5DOC);
diff --git a/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-sink.json b/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-sink.json
index ac73001..49fb584 100644
--- a/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-sink.json
+++ b/connectors/camel-aws2-sns-kafka-connector/src/generated/resources/camel-aws2-sns-sink.json
@@ -117,8 +117,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.useIAMCredentials": {
-			"name": "camel.sink.endpoint.useIAMCredentials",
+		"camel.sink.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
@@ -245,8 +245,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sns.useIAMCredentials": {
-			"name": "camel.component.aws2-sns.useIAMCredentials",
+		"camel.component.aws2-sns.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-sns.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
diff --git a/connectors/camel-aws2-sns-kafka-connector/src/main/docs/camel-aws2-sns-kafka-sink-connector.adoc b/connectors/camel-aws2-sns-kafka-connector/src/main/docs/camel-aws2-sns-kafka-sink-connector.adoc
index a3cd361..ab19b95 100644
--- a/connectors/camel-aws2-sns-kafka-connector/src/main/docs/camel-aws2-sns-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-sns-kafka-connector/src/main/docs/camel-aws2-sns-kafka-sink-connector.adoc
@@ -46,7 +46,7 @@ The camel-aws2-sns sink connector supports 41 options, which are listed below.
 | *camel.sink.endpoint.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.sink.endpoint.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
-| *camel.sink.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.sink.endpoint.useDefaultCredentialsProvider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -66,7 +66,7 @@ The camel-aws2-sns sink connector supports 41 options, which are listed below.
 | *camel.component.aws2-sns.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws2-sns.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
 | *camel.component.aws2-sns.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
-| *camel.component.aws2-sns.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.component.aws2-sns.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sns.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-sns.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-sns.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/connectors/camel-aws2-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sns/CamelAws2snsSinkConnectorConfig.java b/connectors/camel-aws2-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sns/CamelAws2snsSinkConnectorConfig.java
index a3b957d..8756009 100644
--- a/connectors/camel-aws2-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sns/CamelAws2snsSinkConnectorConfig.java
+++ b/connectors/camel-aws2-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sns/CamelAws2snsSinkConnectorConfig.java
@@ -75,9 +75,9 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
-    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_USE_IAMCREDENTIALS_CONF = "camel.sink.endpoint.useIAMCredentials";
-    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
-    public static final Boolean CAMEL_SINK_AWS2SNS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.sink.endpoint.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWS2SNS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWS2SNS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -135,9 +135,9 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-sns.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
-    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_USE_IAMCREDENTIALS_CONF = "camel.component.aws2-sns.useIAMCredentials";
-    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
-    public static final Boolean CAMEL_SINK_AWS2SNS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.component.aws2-sns.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-sns.autowiredEnabled";
     public static final String CAMEL_SINK_AWS2SNS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
     public static final Boolean CAMEL_SINK_AWS2SNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
@@ -177,7 +177,7 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSCONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
-        conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_USE_IAMCREDENTIALS_DOC);
+        conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_ENDPOINT_SECRET_KEY_DOC);
@@ -197,7 +197,7 @@ public class CamelAws2snsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_SUBSCRIBE_SNSTO_SQSCONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
-        conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_USE_IAMCREDENTIALS_DOC);
+        conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2SNS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SNS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SNS_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json
index fcbf868..f731da7 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json
@@ -74,8 +74,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.useIAMCredentials": {
-			"name": "camel.sink.endpoint.useIAMCredentials",
+		"camel.sink.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
@@ -246,8 +246,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.useIAMCredentials": {
-			"name": "camel.component.aws2-sqs.useIAMCredentials",
+		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json
index ff4c0b8..03e382c 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json
@@ -74,8 +74,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.useIAMCredentials": {
-			"name": "camel.source.endpoint.useIAMCredentials",
+		"camel.source.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.source.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
@@ -422,8 +422,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.useIAMCredentials": {
-			"name": "camel.component.aws2-sqs.useIAMCredentials",
+		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc
index 3cc4922..636d972 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc
@@ -39,7 +39,7 @@ The camel-aws2-sqs sink connector supports 55 options, which are listed below.
 | *camel.sink.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
-| *camel.sink.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.sink.endpoint.useDefaultCredentialsProvider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.sink.endpoint.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
@@ -66,7 +66,7 @@ The camel-aws2-sqs sink connector supports 55 options, which are listed below.
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
-| *camel.component.aws2-sqs.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.component.aws2-sqs.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.component.aws2-sqs.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-sqs.messageDeduplicationId Strategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc
index ed8e159..43cdb98 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc
@@ -39,7 +39,7 @@ The camel-aws2-sqs source connector supports 90 options, which are listed below.
 | *camel.source.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.source.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.source.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
-| *camel.source.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.source.endpoint.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.source.endpoint.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
@@ -93,7 +93,7 @@ The camel-aws2-sqs source connector supports 90 options, which are listed below.
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
-| *camel.component.aws2-sqs.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.component.aws2-sqs.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.component.aws2-sqs.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.component.aws2-sqs.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java
index e974de5..47fb020 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java
@@ -54,9 +54,9 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
-    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_CONF = "camel.sink.endpoint.useIAMCredentials";
-    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
-    public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.sink.endpoint.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_CONF = "camel.sink.endpoint.delaySeconds";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DOC = "Delay sending messages for a number of seconds.";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DEFAULT = null;
@@ -135,9 +135,9 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-sqs.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
-    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_CONF = "camel.component.aws2-sqs.useIAMCredentials";
-    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
-    public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.component.aws2-sqs.useDefaultCredentialsProvider";
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_CONF = "camel.component.aws2-sqs.delaySeconds";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DOC = "Delay sending messages for a number of seconds.";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DEFAULT = null;
@@ -212,7 +212,7 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
-        conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
@@ -239,7 +239,7 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
-        conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java
index d5e48af..4146bc4 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java
@@ -56,9 +56,9 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.source.endpoint.trustAllCertificates";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_CONF = "camel.source.endpoint.useIAMCredentials";
-    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
-    public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.source.endpoint.useDefaultCredentialsProvider";
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_CONF = "camel.source.endpoint.attributeNames";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DOC = "A list of attribute names to receive when consuming. Multiple names can be separated by comma.";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DEFAULT = null;
@@ -218,9 +218,9 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-sqs.trustAllCertificates";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_CONF = "camel.component.aws2-sqs.useIAMCredentials";
-    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
-    public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF = "camel.component.aws2-sqs.useDefaultCredentialsProvider";
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_CONF = "camel.component.aws2-sqs.attributeNames";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DOC = "A list of attribute names to receive when consuming. Multiple names can be separated by comma.";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DEFAULT = null;
@@ -319,7 +319,7 @@ public class CamelAws2sqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
-        conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DOC);
+        conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWS2SQS_ENDPOINT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_CONCURRENT_CONSUMERS_DOC);
@@ -373,7 +373,7 @@ public class CamelAws2sqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
-        conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DOC);
+        conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_DEFAULT_CREDENTIALS_PROVIDER_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWS2SQS_COMPONENT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_CONCURRENT_CONSUMERS_DOC);
diff --git a/connectors/camel-graphql-kafka-connector/src/generated/resources/camel-graphql-sink.json b/connectors/camel-graphql-kafka-connector/src/generated/resources/camel-graphql-sink.json
index 6ce7dbd..e44f0f1 100644
--- a/connectors/camel-graphql-kafka-connector/src/generated/resources/camel-graphql-sink.json
+++ b/connectors/camel-graphql-kafka-connector/src/generated/resources/camel-graphql-sink.json
@@ -65,6 +65,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.jwtAuthorizationType": {
+			"name": "camel.sink.endpoint.jwtAuthorizationType",
+			"description": "The JWT Authorization type. Default is Bearer.",
+			"defaultValue": "\"Bearer\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.password": {
 			"name": "camel.sink.endpoint.password",
 			"description": "The password for Basic authentication.",
diff --git a/connectors/camel-graphql-kafka-connector/src/main/docs/camel-graphql-kafka-sink-connector.adoc b/connectors/camel-graphql-kafka-connector/src/main/docs/camel-graphql-kafka-sink-connector.adoc
index 2d2821b..a748244 100644
--- a/connectors/camel-graphql-kafka-connector/src/main/docs/camel-graphql-kafka-sink-connector.adoc
+++ b/connectors/camel-graphql-kafka-connector/src/main/docs/camel-graphql-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.graphql.CamelGraphqlSinkConnecto
 ----
 
 
-The camel-graphql sink connector supports 13 options, which are listed below.
+The camel-graphql sink connector supports 14 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The camel-graphql sink connector supports 13 options, which are listed below.
 | *camel.sink.endpoint.variables* | The JsonObject instance containing the operation variables. | null | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessToken* | The access token sent in the Authorization header. | null | false | MEDIUM
+| *camel.sink.endpoint.jwtAuthorizationType* | The JWT Authorization type. Default is Bearer. | "Bearer" | false | MEDIUM
 | *camel.sink.endpoint.password* | The password for Basic authentication. | null | false | MEDIUM
 | *camel.sink.endpoint.username* | The username for Basic authentication. | null | false | MEDIUM
 | *camel.component.graphql.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...]
diff --git a/connectors/camel-graphql-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/graphql/CamelGraphqlSinkConnectorConfig.java b/connectors/camel-graphql-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/graphql/CamelGraphqlSinkConnectorConfig.java
index 4f7d1df..68794e9 100644
--- a/connectors/camel-graphql-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/graphql/CamelGraphqlSinkConnectorConfig.java
+++ b/connectors/camel-graphql-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/graphql/CamelGraphqlSinkConnectorConfig.java
@@ -51,6 +51,9 @@ public class CamelGraphqlSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_GRAPHQL_ENDPOINT_ACCESS_TOKEN_CONF = "camel.sink.endpoint.accessToken";
     public static final String CAMEL_SINK_GRAPHQL_ENDPOINT_ACCESS_TOKEN_DOC = "The access token sent in the Authorization header.";
     public static final String CAMEL_SINK_GRAPHQL_ENDPOINT_ACCESS_TOKEN_DEFAULT = null;
+    public static final String CAMEL_SINK_GRAPHQL_ENDPOINT_JWT_AUTHORIZATION_TYPE_CONF = "camel.sink.endpoint.jwtAuthorizationType";
+    public static final String CAMEL_SINK_GRAPHQL_ENDPOINT_JWT_AUTHORIZATION_TYPE_DOC = "The JWT Authorization type. Default is Bearer.";
+    public static final String CAMEL_SINK_GRAPHQL_ENDPOINT_JWT_AUTHORIZATION_TYPE_DEFAULT = "Bearer";
     public static final String CAMEL_SINK_GRAPHQL_ENDPOINT_PASSWORD_CONF = "camel.sink.endpoint.password";
     public static final String CAMEL_SINK_GRAPHQL_ENDPOINT_PASSWORD_DOC = "The password for Basic authentication.";
     public static final String CAMEL_SINK_GRAPHQL_ENDPOINT_PASSWORD_DEFAULT = null;
@@ -85,6 +88,7 @@ public class CamelGraphqlSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_GRAPHQL_ENDPOINT_VARIABLES_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GRAPHQL_ENDPOINT_VARIABLES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRAPHQL_ENDPOINT_VARIABLES_DOC);
         conf.define(CAMEL_SINK_GRAPHQL_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GRAPHQL_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRAPHQL_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_GRAPHQL_ENDPOINT_ACCESS_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GRAPHQL_ENDPOINT_ACCESS_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRAPHQL_ENDPOINT_ACCESS_TOKEN_DOC);
+        conf.define(CAMEL_SINK_GRAPHQL_ENDPOINT_JWT_AUTHORIZATION_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GRAPHQL_ENDPOINT_JWT_AUTHORIZATION_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRAPHQL_ENDPOINT_JWT_AUTHORIZATION_TYPE_DOC);
         conf.define(CAMEL_SINK_GRAPHQL_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GRAPHQL_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRAPHQL_ENDPOINT_PASSWORD_DOC);
         conf.define(CAMEL_SINK_GRAPHQL_ENDPOINT_USERNAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GRAPHQL_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRAPHQL_ENDPOINT_USERNAME_DOC);
         conf.define(CAMEL_SINK_GRAPHQL_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GRAPHQL_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRAPHQL_COMPONENT_LAZY_START_PRODUCER_DOC);
diff --git a/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-sink.json b/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-sink.json
index 60fe53a..c2f48bf 100644
--- a/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-sink.json
+++ b/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-sink.json
@@ -36,7 +36,7 @@
 		"camel.sink.endpoint.apiVersion": {
 			"name": "camel.sink.endpoint.apiVersion",
 			"description": "Salesforce API version.",
-			"defaultValue": "\"34.0\"",
+			"defaultValue": "\"50.0\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -284,7 +284,7 @@
 		"camel.component.salesforce.apiVersion": {
 			"name": "camel.component.salesforce.apiVersion",
 			"description": "Salesforce API version.",
-			"defaultValue": "\"34.0\"",
+			"defaultValue": "\"50.0\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-source.json b/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-source.json
index 68e7968..425fd94 100644
--- a/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-source.json
+++ b/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-source.json
@@ -36,7 +36,7 @@
 		"camel.source.endpoint.apiVersion": {
 			"name": "camel.source.endpoint.apiVersion",
 			"description": "Salesforce API version.",
-			"defaultValue": "\"34.0\"",
+			"defaultValue": "\"50.0\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -302,7 +302,7 @@
 		"camel.component.salesforce.apiVersion": {
 			"name": "camel.component.salesforce.apiVersion",
 			"description": "Salesforce API version.",
-			"defaultValue": "\"34.0\"",
+			"defaultValue": "\"50.0\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-sink-connector.adoc b/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-sink-connector.adoc
index b7c71da..a38141e 100644
--- a/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-sink-connector.adoc
+++ b/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-sink-connector.adoc
@@ -33,7 +33,7 @@ The camel-salesforce sink connector supports 112 options, which are listed below
 | *camel.sink.endpoint.apexMethod* | APEX method name | null | false | MEDIUM
 | *camel.sink.endpoint.apexQueryParams* | Query params for APEX method | null | false | MEDIUM
 | *camel.sink.endpoint.apexUrl* | APEX method URL | null | false | MEDIUM
-| *camel.sink.endpoint.apiVersion* | Salesforce API version. | "34.0" | false | MEDIUM
+| *camel.sink.endpoint.apiVersion* | Salesforce API version. | "50.0" | false | MEDIUM
 | *camel.sink.endpoint.backoffIncrement* | Backoff interval increment for Streaming connection restart attempts for failures beyond CometD auto-reconnect. | 1000L | false | MEDIUM
 | *camel.sink.endpoint.batchId* | Bulk API Batch ID | null | false | MEDIUM
 | *camel.sink.endpoint.contentType* | Bulk API content type, one of XML, CSV, ZIP_XML, ZIP_CSV One of: [XML] [CSV] [JSON] [ZIP_XML] [ZIP_CSV] [ZIP_JSON] | null | false | MEDIUM
@@ -73,7 +73,7 @@ The camel-salesforce sink connector supports 112 options, which are listed below
 | *camel.component.salesforce.apexMethod* | APEX method name | null | false | MEDIUM
 | *camel.component.salesforce.apexQueryParams* | Query params for APEX method | null | false | MEDIUM
 | *camel.component.salesforce.apexUrl* | APEX method URL | null | false | MEDIUM
-| *camel.component.salesforce.apiVersion* | Salesforce API version. | "34.0" | false | MEDIUM
+| *camel.component.salesforce.apiVersion* | Salesforce API version. | "50.0" | false | MEDIUM
 | *camel.component.salesforce.backoffIncrement* | Backoff interval increment for Streaming connection restart attempts for failures beyond CometD auto-reconnect. | 1000L | false | MEDIUM
 | *camel.component.salesforce.batchId* | Bulk API Batch ID | null | false | MEDIUM
 | *camel.component.salesforce.contentType* | Bulk API content type, one of XML, CSV, ZIP_XML, ZIP_CSV One of: [XML] [CSV] [JSON] [ZIP_XML] [ZIP_CSV] [ZIP_JSON] | null | false | MEDIUM
diff --git a/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-source-connector.adoc b/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-source-connector.adoc
index 63c351e..48c45c6 100644
--- a/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-source-connector.adoc
+++ b/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-source-connector.adoc
@@ -33,7 +33,7 @@ The camel-salesforce source connector supports 115 options, which are listed bel
 | *camel.source.endpoint.apexMethod* | APEX method name | null | false | MEDIUM
 | *camel.source.endpoint.apexQueryParams* | Query params for APEX method | null | false | MEDIUM
 | *camel.source.endpoint.apexUrl* | APEX method URL | null | false | MEDIUM
-| *camel.source.endpoint.apiVersion* | Salesforce API version. | "34.0" | false | MEDIUM
+| *camel.source.endpoint.apiVersion* | Salesforce API version. | "50.0" | false | MEDIUM
 | *camel.source.endpoint.backoffIncrement* | Backoff interval increment for Streaming connection restart attempts for failures beyond CometD auto-reconnect. | 1000L | false | MEDIUM
 | *camel.source.endpoint.batchId* | Bulk API Batch ID | null | false | MEDIUM
 | *camel.source.endpoint.contentType* | Bulk API content type, one of XML, CSV, ZIP_XML, ZIP_CSV One of: [XML] [CSV] [JSON] [ZIP_XML] [ZIP_CSV] [ZIP_JSON] | null | false | MEDIUM
@@ -76,7 +76,7 @@ The camel-salesforce source connector supports 115 options, which are listed bel
 | *camel.component.salesforce.apexMethod* | APEX method name | null | false | MEDIUM
 | *camel.component.salesforce.apexQueryParams* | Query params for APEX method | null | false | MEDIUM
 | *camel.component.salesforce.apexUrl* | APEX method URL | null | false | MEDIUM
-| *camel.component.salesforce.apiVersion* | Salesforce API version. | "34.0" | false | MEDIUM
+| *camel.component.salesforce.apiVersion* | Salesforce API version. | "50.0" | false | MEDIUM
 | *camel.component.salesforce.backoffIncrement* | Backoff interval increment for Streaming connection restart attempts for failures beyond CometD auto-reconnect. | 1000L | false | MEDIUM
 | *camel.component.salesforce.batchId* | Bulk API Batch ID | null | false | MEDIUM
 | *camel.component.salesforce.contentType* | Bulk API content type, one of XML, CSV, ZIP_XML, ZIP_CSV One of: [XML] [CSV] [JSON] [ZIP_XML] [ZIP_CSV] [ZIP_JSON] | null | false | MEDIUM
diff --git a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkConnectorConfig.java b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkConnectorConfig.java
index e2caa8f..5dad693 100644
--- a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkConnectorConfig.java
+++ b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkConnectorConfig.java
@@ -40,7 +40,7 @@ public class CamelSalesforceSinkConnectorConfig
     public static final String CAMEL_SINK_SALESFORCE_ENDPOINT_APEX_URL_DEFAULT = null;
     public static final String CAMEL_SINK_SALESFORCE_ENDPOINT_API_VERSION_CONF = "camel.sink.endpoint.apiVersion";
     public static final String CAMEL_SINK_SALESFORCE_ENDPOINT_API_VERSION_DOC = "Salesforce API version.";
-    public static final String CAMEL_SINK_SALESFORCE_ENDPOINT_API_VERSION_DEFAULT = "34.0";
+    public static final String CAMEL_SINK_SALESFORCE_ENDPOINT_API_VERSION_DEFAULT = "50.0";
     public static final String CAMEL_SINK_SALESFORCE_ENDPOINT_BACKOFF_INCREMENT_CONF = "camel.sink.endpoint.backoffIncrement";
     public static final String CAMEL_SINK_SALESFORCE_ENDPOINT_BACKOFF_INCREMENT_DOC = "Backoff interval increment for Streaming connection restart attempts for failures beyond CometD auto-reconnect.";
     public static final Long CAMEL_SINK_SALESFORCE_ENDPOINT_BACKOFF_INCREMENT_DEFAULT = 1000L;
@@ -160,7 +160,7 @@ public class CamelSalesforceSinkConnectorConfig
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_APEX_URL_DEFAULT = null;
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_API_VERSION_CONF = "camel.component.salesforce.apiVersion";
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_API_VERSION_DOC = "Salesforce API version.";
-    public static final String CAMEL_SINK_SALESFORCE_COMPONENT_API_VERSION_DEFAULT = "34.0";
+    public static final String CAMEL_SINK_SALESFORCE_COMPONENT_API_VERSION_DEFAULT = "50.0";
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_BACKOFF_INCREMENT_CONF = "camel.component.salesforce.backoffIncrement";
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_BACKOFF_INCREMENT_DOC = "Backoff interval increment for Streaming connection restart attempts for failures beyond CometD auto-reconnect.";
     public static final Long CAMEL_SINK_SALESFORCE_COMPONENT_BACKOFF_INCREMENT_DEFAULT = 1000L;
diff --git a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceConnectorConfig.java b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceConnectorConfig.java
index 02f04a3..864c339 100644
--- a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceConnectorConfig.java
+++ b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceConnectorConfig.java
@@ -40,7 +40,7 @@ public class CamelSalesforceSourceConnectorConfig
     public static final String CAMEL_SOURCE_SALESFORCE_ENDPOINT_APEX_URL_DEFAULT = null;
     public static final String CAMEL_SOURCE_SALESFORCE_ENDPOINT_API_VERSION_CONF = "camel.source.endpoint.apiVersion";
     public static final String CAMEL_SOURCE_SALESFORCE_ENDPOINT_API_VERSION_DOC = "Salesforce API version.";
-    public static final String CAMEL_SOURCE_SALESFORCE_ENDPOINT_API_VERSION_DEFAULT = "34.0";
+    public static final String CAMEL_SOURCE_SALESFORCE_ENDPOINT_API_VERSION_DEFAULT = "50.0";
     public static final String CAMEL_SOURCE_SALESFORCE_ENDPOINT_BACKOFF_INCREMENT_CONF = "camel.source.endpoint.backoffIncrement";
     public static final String CAMEL_SOURCE_SALESFORCE_ENDPOINT_BACKOFF_INCREMENT_DOC = "Backoff interval increment for Streaming connection restart attempts for failures beyond CometD auto-reconnect.";
     public static final Long CAMEL_SOURCE_SALESFORCE_ENDPOINT_BACKOFF_INCREMENT_DEFAULT = 1000L;
@@ -169,7 +169,7 @@ public class CamelSalesforceSourceConnectorConfig
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_APEX_URL_DEFAULT = null;
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_API_VERSION_CONF = "camel.component.salesforce.apiVersion";
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_API_VERSION_DOC = "Salesforce API version.";
-    public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_API_VERSION_DEFAULT = "34.0";
+    public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_API_VERSION_DEFAULT = "50.0";
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_BACKOFF_INCREMENT_CONF = "camel.component.salesforce.backoffIncrement";
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_BACKOFF_INCREMENT_DOC = "Backoff interval increment for Streaming connection restart attempts for failures beyond CometD auto-reconnect.";
     public static final Long CAMEL_SOURCE_SALESFORCE_COMPONENT_BACKOFF_INCREMENT_DEFAULT = 1000L;
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransformTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransformTest.java
index dfe1ed6..fbd5144 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransformTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransformTest.java
@@ -22,6 +22,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.camel.component.slack.helper.SlackMessage;
+import org.apache.camel.component.slack.helper.SlackMessage.Attachment;
+import org.apache.camel.component.slack.helper.SlackMessage.Attachment.Field;
 import org.apache.kafka.connect.connector.ConnectRecord;
 import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.Struct;
@@ -42,14 +44,14 @@ public class SourcePojoToSchemaAndStructTransformTest {
 
         SlackMessage sm = new SlackMessage();
 
-        SlackMessage.Attachment at1 = sm.new Attachment();
-        SlackMessage.Attachment.Field at1f1 = at1.new Field();
+        SlackMessage.Attachment at1 = new Attachment();
+        SlackMessage.Attachment.Field at1f1 = new Field();
         at1f1.setTitle("ciao");
         at1f1.setShortValue(true);
         at1.setFields(new ArrayList<SlackMessage.Attachment.Field>(Collections.singleton(at1f1)));
         at1.setAuthorName("Andrea");
 
-        SlackMessage.Attachment at2 = sm.new Attachment();
+        SlackMessage.Attachment at2 = new Attachment();
         at2.setColor("green");
 
         ArrayList<SlackMessage.Attachment> attachments = new ArrayList<>();
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc
index ffe0bd0..18a7c1a 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SinkConnector
 ----
 
 
-The camel-aws2-s3 sink connector supports 58 options, which are listed below.
+The camel-aws2-s3 sink connector supports 60 options, which are listed below.
 
 
 
@@ -31,6 +31,7 @@ The camel-aws2-s3 sink connector supports 58 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.bucketNameOrArn* | Bucket name or ARN | null | true | HIGH
 | *camel.sink.endpoint.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
+| *camel.sink.endpoint.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
 | *camel.sink.endpoint.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
 | *camel.sink.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.sink.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
@@ -41,7 +42,7 @@ The camel-aws2-s3 sink connector supports 58 options, which are listed below.
 | *camel.sink.endpoint.region* | The region in which S3 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.sink.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
-| *camel.sink.endpoint.useIAMCredentials* | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.sink.endpoint.useDefaultCredentialsProvider* | Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.sink.endpoint.customerAlgorithm* | Define the customer algorithm to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.sink.endpoint.customerKeyId* | Define the id of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.sink.endpoint.customerKeyMD5* | Define the MD5 of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
@@ -59,6 +60,7 @@ The camel-aws2-s3 sink connector supports 58 options, which are listed below.
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-s3.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
+| *camel.component.aws2-s3.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
 | *camel.component.aws2-s3.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
 | *camel.component.aws2-s3.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-s3.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
@@ -70,7 +72,7 @@ The camel-aws2-s3 sink connector supports 58 options, which are listed below.
 | *camel.component.aws2-s3.region* | The region in which S3 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-s3.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.component.aws2-s3.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
-| *camel.component.aws2-s3.useIAMCredentials* | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.component.aws2-s3.useDefaultCredentials Provider* | Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-s3.customerAlgorithm* | Define the customer algorithm to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.component.aws2-s3.customerKeyId* | Define the id of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.component.aws2-s3.customerKeyMD5* | Define the MD5 of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc
index 0c67013..466b485 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-s3-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SourceConnecto
 ----
 
 
-The camel-aws2-s3 source connector supports 82 options, which are listed below.
+The camel-aws2-s3 source connector supports 84 options, which are listed below.
 
 
 
@@ -31,6 +31,7 @@ The camel-aws2-s3 source connector supports 82 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.source.path.bucketNameOrArn* | Bucket name or ARN | null | true | HIGH
 | *camel.source.endpoint.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
+| *camel.source.endpoint.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
 | *camel.source.endpoint.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
 | *camel.source.endpoint.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
 | *camel.source.endpoint.pojoRequest* | If we want to use a POJO request as body or not | false | false | MEDIUM
@@ -41,7 +42,7 @@ The camel-aws2-s3 source connector supports 82 options, which are listed below.
 | *camel.source.endpoint.region* | The region in which S3 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.source.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.source.endpoint.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
-| *camel.source.endpoint.useIAMCredentials* | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.source.endpoint.useDefaultCredentials Provider* | Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.source.endpoint.customerAlgorithm* | Define the customer algorithm to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.source.endpoint.customerKeyId* | Define the id of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.source.endpoint.customerKeyMD5* | Define the MD5 of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
@@ -81,6 +82,7 @@ The camel-aws2-s3 source connector supports 82 options, which are listed below.
 | *camel.source.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.source.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-s3.amazonS3Client* | Reference to a com.amazonaws.services.s3.AmazonS3 in the registry. | null | false | MEDIUM
+| *camel.component.aws2-s3.amazonS3Presigner* | An S3 Presigner for Request, used mainly in createDownloadLink operation | null | false | MEDIUM
 | *camel.component.aws2-s3.autoCreateBucket* | Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already. | true | false | MEDIUM
 | *camel.component.aws2-s3.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-s3.overrideEndpoint* | Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option | false | false | MEDIUM
@@ -92,7 +94,7 @@ The camel-aws2-s3 source connector supports 82 options, which are listed below.
 | *camel.component.aws2-s3.region* | The region in which S3 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-s3.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.component.aws2-s3.uriEndpointOverride* | Set the overriding uri endpoint. This option needs to be used in combination with overrideEndpoint option | null | false | MEDIUM
-| *camel.component.aws2-s3.useIAMCredentials* | Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.component.aws2-s3.useDefaultCredentials Provider* | Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-s3.customerAlgorithm* | Define the customer algorithm to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.component.aws2-s3.customerKeyId* | Define the id of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
 | *camel.component.aws2-s3.customerKeyMD5* | Define the MD5 of Customer key to use in case CustomerKey is enabled | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sns-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sns-kafka-sink-connector.adoc
index a3cd361..ab19b95 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-sns-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sns-kafka-sink-connector.adoc
@@ -46,7 +46,7 @@ The camel-aws2-sns sink connector supports 41 options, which are listed below.
 | *camel.sink.endpoint.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.sink.endpoint.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
-| *camel.sink.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.sink.endpoint.useDefaultCredentialsProvider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -66,7 +66,7 @@ The camel-aws2-sns sink connector supports 41 options, which are listed below.
 | *camel.component.aws2-sns.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws2-sns.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
 | *camel.component.aws2-sns.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
-| *camel.component.aws2-sns.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.component.aws2-sns.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sns.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-sns.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-sns.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc
index 3cc4922..636d972 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc
@@ -39,7 +39,7 @@ The camel-aws2-sqs sink connector supports 55 options, which are listed below.
 | *camel.sink.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
-| *camel.sink.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.sink.endpoint.useDefaultCredentialsProvider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.sink.endpoint.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
@@ -66,7 +66,7 @@ The camel-aws2-sqs sink connector supports 55 options, which are listed below.
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
-| *camel.component.aws2-sqs.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.component.aws2-sqs.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.component.aws2-sqs.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-sqs.messageDeduplicationId Strategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc
index ed8e159..43cdb98 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc
@@ -39,7 +39,7 @@ The camel-aws2-sqs source connector supports 90 options, which are listed below.
 | *camel.source.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.source.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.source.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
-| *camel.source.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.source.endpoint.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.source.endpoint.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
@@ -93,7 +93,7 @@ The camel-aws2-sqs source connector supports 90 options, which are listed below.
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
-| *camel.component.aws2-sqs.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
+| *camel.component.aws2-sqs.useDefaultCredentials Provider* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.component.aws2-sqs.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.component.aws2-sqs.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-graphql-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-graphql-kafka-sink-connector.adoc
index 2d2821b..a748244 100644
--- a/docs/modules/ROOT/pages/connectors/camel-graphql-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-graphql-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.graphql.CamelGraphqlSinkConnecto
 ----
 
 
-The camel-graphql sink connector supports 13 options, which are listed below.
+The camel-graphql sink connector supports 14 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The camel-graphql sink connector supports 13 options, which are listed below.
 | *camel.sink.endpoint.variables* | The JsonObject instance containing the operation variables. | null | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessToken* | The access token sent in the Authorization header. | null | false | MEDIUM
+| *camel.sink.endpoint.jwtAuthorizationType* | The JWT Authorization type. Default is Bearer. | "Bearer" | false | MEDIUM
 | *camel.sink.endpoint.password* | The password for Basic authentication. | null | false | MEDIUM
 | *camel.sink.endpoint.username* | The username for Basic authentication. | null | false | MEDIUM
 | *camel.component.graphql.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...]
diff --git a/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-sink-connector.adoc
index b7c71da..a38141e 100644
--- a/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-sink-connector.adoc
@@ -33,7 +33,7 @@ The camel-salesforce sink connector supports 112 options, which are listed below
 | *camel.sink.endpoint.apexMethod* | APEX method name | null | false | MEDIUM
 | *camel.sink.endpoint.apexQueryParams* | Query params for APEX method | null | false | MEDIUM
 | *camel.sink.endpoint.apexUrl* | APEX method URL | null | false | MEDIUM
-| *camel.sink.endpoint.apiVersion* | Salesforce API version. | "34.0" | false | MEDIUM
+| *camel.sink.endpoint.apiVersion* | Salesforce API version. | "50.0" | false | MEDIUM
 | *camel.sink.endpoint.backoffIncrement* | Backoff interval increment for Streaming connection restart attempts for failures beyond CometD auto-reconnect. | 1000L | false | MEDIUM
 | *camel.sink.endpoint.batchId* | Bulk API Batch ID | null | false | MEDIUM
 | *camel.sink.endpoint.contentType* | Bulk API content type, one of XML, CSV, ZIP_XML, ZIP_CSV One of: [XML] [CSV] [JSON] [ZIP_XML] [ZIP_CSV] [ZIP_JSON] | null | false | MEDIUM
@@ -73,7 +73,7 @@ The camel-salesforce sink connector supports 112 options, which are listed below
 | *camel.component.salesforce.apexMethod* | APEX method name | null | false | MEDIUM
 | *camel.component.salesforce.apexQueryParams* | Query params for APEX method | null | false | MEDIUM
 | *camel.component.salesforce.apexUrl* | APEX method URL | null | false | MEDIUM
-| *camel.component.salesforce.apiVersion* | Salesforce API version. | "34.0" | false | MEDIUM
+| *camel.component.salesforce.apiVersion* | Salesforce API version. | "50.0" | false | MEDIUM
 | *camel.component.salesforce.backoffIncrement* | Backoff interval increment for Streaming connection restart attempts for failures beyond CometD auto-reconnect. | 1000L | false | MEDIUM
 | *camel.component.salesforce.batchId* | Bulk API Batch ID | null | false | MEDIUM
 | *camel.component.salesforce.contentType* | Bulk API content type, one of XML, CSV, ZIP_XML, ZIP_CSV One of: [XML] [CSV] [JSON] [ZIP_XML] [ZIP_CSV] [ZIP_JSON] | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-source-connector.adoc
index 63c351e..48c45c6 100644
--- a/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-source-connector.adoc
@@ -33,7 +33,7 @@ The camel-salesforce source connector supports 115 options, which are listed bel
 | *camel.source.endpoint.apexMethod* | APEX method name | null | false | MEDIUM
 | *camel.source.endpoint.apexQueryParams* | Query params for APEX method | null | false | MEDIUM
 | *camel.source.endpoint.apexUrl* | APEX method URL | null | false | MEDIUM
-| *camel.source.endpoint.apiVersion* | Salesforce API version. | "34.0" | false | MEDIUM
+| *camel.source.endpoint.apiVersion* | Salesforce API version. | "50.0" | false | MEDIUM
 | *camel.source.endpoint.backoffIncrement* | Backoff interval increment for Streaming connection restart attempts for failures beyond CometD auto-reconnect. | 1000L | false | MEDIUM
 | *camel.source.endpoint.batchId* | Bulk API Batch ID | null | false | MEDIUM
 | *camel.source.endpoint.contentType* | Bulk API content type, one of XML, CSV, ZIP_XML, ZIP_CSV One of: [XML] [CSV] [JSON] [ZIP_XML] [ZIP_CSV] [ZIP_JSON] | null | false | MEDIUM
@@ -76,7 +76,7 @@ The camel-salesforce source connector supports 115 options, which are listed bel
 | *camel.component.salesforce.apexMethod* | APEX method name | null | false | MEDIUM
 | *camel.component.salesforce.apexQueryParams* | Query params for APEX method | null | false | MEDIUM
 | *camel.component.salesforce.apexUrl* | APEX method URL | null | false | MEDIUM
-| *camel.component.salesforce.apiVersion* | Salesforce API version. | "34.0" | false | MEDIUM
+| *camel.component.salesforce.apiVersion* | Salesforce API version. | "50.0" | false | MEDIUM
 | *camel.component.salesforce.backoffIncrement* | Backoff interval increment for Streaming connection restart attempts for failures beyond CometD auto-reconnect. | 1000L | false | MEDIUM
 | *camel.component.salesforce.batchId* | Bulk API Batch ID | null | false | MEDIUM
 | *camel.component.salesforce.contentType* | Bulk API content type, one of XML, CSV, ZIP_XML, ZIP_CSV One of: [XML] [CSV] [JSON] [ZIP_XML] [ZIP_CSV] [ZIP_JSON] | null | false | MEDIUM


[camel-kafka-connector] 14/21: Updated AWS test services according to interface changes from camel 3.7

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit bff8ad67adb9a8c93ab3b1ec349b741924ed2e67
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Thu Nov 19 09:34:41 2020 +0100

    Updated AWS test services according to interface changes from camel 3.7
---
 .../aws/v1/clients/AWSClientUtils.java             | 89 ----------------------
 .../source/CamelSourceAWSKinesisITCase.java        |  5 +-
 .../aws/v1/s3/source/CamelSourceAWSS3ITCase.java   | 67 +++++++++++++++-
 .../aws/v1/sns/sink/CamelSinkAWSSNSITCase.java     |  6 +-
 .../aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java     |  6 +-
 .../aws/v1/sqs/source/CamelSourceAWSSQSITCase.java |  6 +-
 .../aws/v2/clients/AWSSDKClientUtils.java          | 67 ----------------
 .../source/CamelSourceAWSKinesisITCase.java        |  5 +-
 .../aws/v2/s3/source/CamelSourceAWSS3ITCase.java   | 48 +++++++++++-
 .../aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java     |  6 +-
 .../aws/v2/sqs/source/CamelSourceAWSSQSITCase.java |  6 +-
 11 files changed, 128 insertions(+), 183 deletions(-)

diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/clients/AWSClientUtils.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/clients/AWSClientUtils.java
deleted file mode 100644
index 93399a8..0000000
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/clients/AWSClientUtils.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v1.clients;
-
-import java.util.Iterator;
-
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.ListVersionsRequest;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
-import com.amazonaws.services.s3.model.S3VersionSummary;
-import com.amazonaws.services.s3.model.VersionListing;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class AWSClientUtils {
-    private static final Logger LOG = LoggerFactory.getLogger(AWSClientUtils.class);
-
-    private AWSClientUtils() {
-    }
-
-    /**
-     * Delete an S3 bucket using the provided client. Coming from AWS documentation:
-     * https://docs.aws.amazon.com/AmazonS3/latest/dev/delete-or-empty-bucket.html#delete-bucket-sdk-java
-     * 
-     * @param s3Client
-     *            the AmazonS3 client instance used to delete the bucket
-     * @param bucketName
-     *            a String containing the bucket name
-     */
-    public static void deleteBucket(AmazonS3 s3Client, String bucketName) {
-        // Delete all objects from the bucket. This is sufficient
-        // for non versioned buckets. For versioned buckets, when you attempt to delete objects, Amazon S3 inserts
-        // delete markers for all objects, but doesn't delete the object versions.
-        // To delete objects from versioned buckets, delete all of the object versions before deleting
-        // the bucket (see below for an example).
-        ObjectListing objectListing = s3Client.listObjects(bucketName);
-        while (true) {
-            Iterator<S3ObjectSummary> objIter = objectListing.getObjectSummaries().iterator();
-            while (objIter.hasNext()) {
-                s3Client.deleteObject(bucketName, objIter.next().getKey());
-            }
-
-            // If the bucket contains many objects, the listObjects() call
-            // might not return all of the objects in the first listing. Check to
-            // see whether the listing was truncated. If so, retrieve the next page of objects
-            // and delete them.
-            if (objectListing.isTruncated()) {
-                objectListing = s3Client.listNextBatchOfObjects(objectListing);
-            } else {
-                break;
-            }
-        }
-
-        // Delete all object versions (required for versioned buckets).
-        VersionListing versionList = s3Client.listVersions(new ListVersionsRequest().withBucketName(bucketName));
-        while (true) {
-            Iterator<S3VersionSummary> versionIter = versionList.getVersionSummaries().iterator();
-            while (versionIter.hasNext()) {
-                S3VersionSummary vs = versionIter.next();
-                s3Client.deleteVersion(bucketName, vs.getKey(), vs.getVersionId());
-            }
-
-            if (versionList.isTruncated()) {
-                versionList = s3Client.listNextBatchOfVersions(versionList);
-            } else {
-                break;
-            }
-        }
-
-        // After all objects and object versions are deleted, delete the bucket.
-        s3Client.deleteBucket(bucketName);
-    }
-}
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java
index 0dad306..d16f23c 100644
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java
+++ b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java
@@ -37,6 +37,7 @@ import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
 import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
 import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
 import org.apache.camel.kafkaconnector.common.utils.TestUtils;
+import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
 import org.apache.camel.test.infra.aws.common.AWSCommon;
 import org.apache.camel.test.infra.aws.common.services.AWSService;
 import org.apache.camel.test.infra.aws.services.AWSServiceFactory;
@@ -56,7 +57,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 @Testcontainers
 public class CamelSourceAWSKinesisITCase extends AbstractKafkaTest {
     @RegisterExtension
-    public static AWSService<AmazonKinesis> service = AWSServiceFactory.createKinesisService();
+    public static AWSService service = AWSServiceFactory.createKinesisService();
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSKinesisITCase.class);
 
@@ -124,7 +125,7 @@ public class CamelSourceAWSKinesisITCase extends AbstractKafkaTest {
     public void setUp() {
         streamName = AWSCommon.KINESIS_STREAM_BASE_NAME + "-" + TestUtils.randomWithRange(0, 100);
 
-        awsKinesisClient = service.getClient();
+        awsKinesisClient = AWSClientUtils.newKinesisClient();
         received = 0;
 
         createStream();
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java
index 05e2319..21af556 100644
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java
+++ b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java
@@ -18,16 +18,22 @@
 package org.apache.camel.kafkaconnector.aws.v1.s3.source;
 
 import java.io.File;
+import java.util.Iterator;
 import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.s3.AmazonS3;
-import org.apache.camel.kafkaconnector.aws.v1.clients.AWSClientUtils;
+import com.amazonaws.services.s3.model.ListVersionsRequest;
+import com.amazonaws.services.s3.model.ObjectListing;
+import com.amazonaws.services.s3.model.S3ObjectSummary;
+import com.amazonaws.services.s3.model.S3VersionSummary;
+import com.amazonaws.services.s3.model.VersionListing;
 import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
 import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
 import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
 import org.apache.camel.kafkaconnector.common.utils.TestUtils;
+import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
 import org.apache.camel.test.infra.aws.common.AWSCommon;
 import org.apache.camel.test.infra.aws.common.AWSConfigs;
 import org.apache.camel.test.infra.aws.common.services.AWSService;
@@ -49,7 +55,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 public class CamelSourceAWSS3ITCase extends AbstractKafkaTest {
 
     @RegisterExtension
-    public static AWSService<AmazonS3> service = AWSServiceFactory.createS3Service();
+    public static AWSService service = AWSServiceFactory.createS3Service();
     private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSS3ITCase.class);
 
     private AmazonS3 awsS3Client;
@@ -57,6 +63,59 @@ public class CamelSourceAWSS3ITCase extends AbstractKafkaTest {
     private volatile int received;
     private final int expect = 10;
 
+    /**
+     * Delete an S3 bucket using the provided client. Coming from AWS documentation:
+     * https://docs.aws.amazon.com/AmazonS3/latest/dev/delete-or-empty-bucket.html#delete-bucket-sdk-java
+     *
+     * @param s3Client
+     *            the AmazonS3 client instance used to delete the bucket
+     * @param bucketName
+     *            a String containing the bucket name
+     */
+    public static void deleteBucket(AmazonS3 s3Client, String bucketName) {
+        // Delete all objects from the bucket. This is sufficient
+        // for non versioned buckets. For versioned buckets, when you attempt to delete objects, Amazon S3 inserts
+        // delete markers for all objects, but doesn't delete the object versions.
+        // To delete objects from versioned buckets, delete all of the object versions before deleting
+        // the bucket (see below for an example).
+        ObjectListing objectListing = s3Client.listObjects(bucketName);
+        while (true) {
+            Iterator<S3ObjectSummary> objIter = objectListing.getObjectSummaries().iterator();
+            while (objIter.hasNext()) {
+                s3Client.deleteObject(bucketName, objIter.next().getKey());
+            }
+
+            // If the bucket contains many objects, the listObjects() call
+            // might not return all of the objects in the first listing. Check to
+            // see whether the listing was truncated. If so, retrieve the next page of objects
+            // and delete them.
+            if (objectListing.isTruncated()) {
+                objectListing = s3Client.listNextBatchOfObjects(objectListing);
+            } else {
+                break;
+            }
+        }
+
+        // Delete all object versions (required for versioned buckets).
+        VersionListing versionList = s3Client.listVersions(new ListVersionsRequest().withBucketName(bucketName));
+        while (true) {
+            Iterator<S3VersionSummary> versionIter = versionList.getVersionSummaries().iterator();
+            while (versionIter.hasNext()) {
+                S3VersionSummary vs = versionIter.next();
+                s3Client.deleteVersion(bucketName, vs.getKey(), vs.getVersionId());
+            }
+
+            if (versionList.isTruncated()) {
+                versionList = s3Client.listNextBatchOfVersions(versionList);
+            } else {
+                break;
+            }
+        }
+
+        // After all objects and object versions are deleted, delete the bucket.
+        s3Client.deleteBucket(bucketName);
+    }
+
     @Override
     protected String[] getConnectorsInTest() {
         return new String[] {"camel-aws-s3-kafka-connector"};
@@ -64,7 +123,7 @@ public class CamelSourceAWSS3ITCase extends AbstractKafkaTest {
 
     @BeforeEach
     public void setUp() {
-        awsS3Client = service.getClient();
+        awsS3Client = AWSClientUtils.newS3Client();
         received = 0;
 
         try {
@@ -78,7 +137,7 @@ public class CamelSourceAWSS3ITCase extends AbstractKafkaTest {
     @AfterEach
     public void tearDown() {
         try {
-            AWSClientUtils.deleteBucket(awsS3Client, AWSCommon.DEFAULT_S3_BUCKET);
+            deleteBucket(awsS3Client, AWSCommon.DEFAULT_S3_BUCKET);
         } catch (Exception e) {
             LOG.warn("Unable to delete bucked: {}", e.getMessage(), e);
         }
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java
index 93a709c..4675a30 100644
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java
+++ b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java
@@ -26,13 +26,13 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import com.amazonaws.regions.Regions;
-import com.amazonaws.services.sqs.AmazonSQS;
 import com.amazonaws.services.sqs.model.Message;
 import org.apache.camel.kafkaconnector.aws.v1.clients.AWSSQSClient;
 import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
 import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
 import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
 import org.apache.camel.kafkaconnector.common.utils.TestUtils;
+import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
 import org.apache.camel.test.infra.aws.common.AWSCommon;
 import org.apache.camel.test.infra.aws.common.AWSConfigs;
 import org.apache.camel.test.infra.aws.common.services.AWSService;
@@ -52,7 +52,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 @Testcontainers
 public class CamelSinkAWSSNSITCase extends AbstractKafkaTest {
     @RegisterExtension
-    public static AWSService<AmazonSQS> service = AWSServiceFactory.createSNSService();
+    public static AWSService service = AWSServiceFactory.createSNSService();
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelSinkAWSSNSITCase.class);
 
@@ -70,7 +70,7 @@ public class CamelSinkAWSSNSITCase extends AbstractKafkaTest {
 
     @BeforeEach
     public void setUp() {
-        awsSqsClient = new AWSSQSClient(service.getClient());
+        awsSqsClient = new AWSSQSClient(AWSClientUtils.newSQSClient());
 
         queueName = AWSCommon.DEFAULT_SQS_QUEUE_FOR_SNS + "-" + TestUtils.randomWithRange(0, 1000);
         sqsQueueUrl = awsSqsClient.getQueue(queueName);
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java
index c595c67..b993ad4 100644
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java
+++ b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java
@@ -25,13 +25,13 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import com.amazonaws.regions.Regions;
-import com.amazonaws.services.sqs.AmazonSQS;
 import com.amazonaws.services.sqs.model.Message;
 import org.apache.camel.kafkaconnector.aws.v1.clients.AWSSQSClient;
 import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
 import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
 import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
 import org.apache.camel.kafkaconnector.common.utils.TestUtils;
+import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
 import org.apache.camel.test.infra.aws.common.AWSCommon;
 import org.apache.camel.test.infra.aws.common.AWSConfigs;
 import org.apache.camel.test.infra.aws.common.services.AWSService;
@@ -53,7 +53,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 @Testcontainers
 public class CamelSinkAWSSQSITCase extends AbstractKafkaTest {
     @RegisterExtension
-    public static AWSService<AmazonSQS> awsService = AWSServiceFactory.createSQSService();
+    public static AWSService awsService = AWSServiceFactory.createSQSService();
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelSinkAWSSQSITCase.class);
 
@@ -71,7 +71,7 @@ public class CamelSinkAWSSQSITCase extends AbstractKafkaTest {
 
     @BeforeEach
     public void setUp() {
-        awssqsClient = new AWSSQSClient(awsService.getClient());
+        awssqsClient = new AWSSQSClient(AWSClientUtils.newSQSClient());
 
         queueName = AWSCommon.BASE_SQS_QUEUE_NAME + "-" + TestUtils.randomWithRange(0, 1000);
         queueUrl = awssqsClient.getQueue(queueName);
diff --git a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java
index 786042b..69d9b46 100644
--- a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java
+++ b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java
@@ -21,12 +21,12 @@ import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 
 import com.amazonaws.regions.Regions;
-import com.amazonaws.services.sqs.AmazonSQS;
 import org.apache.camel.kafkaconnector.aws.v1.clients.AWSSQSClient;
 import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
 import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
 import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
 import org.apache.camel.kafkaconnector.common.utils.TestUtils;
+import org.apache.camel.test.infra.aws.clients.AWSClientUtils;
 import org.apache.camel.test.infra.aws.common.AWSCommon;
 import org.apache.camel.test.infra.aws.common.AWSConfigs;
 import org.apache.camel.test.infra.aws.common.services.AWSService;
@@ -48,7 +48,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 @Testcontainers
 public class CamelSourceAWSSQSITCase extends AbstractKafkaTest {
     @RegisterExtension
-    public static AWSService<AmazonSQS> service = AWSServiceFactory.createSQSService();
+    public static AWSService service = AWSServiceFactory.createSQSService();
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSSQSITCase.class);
 
@@ -66,7 +66,7 @@ public class CamelSourceAWSSQSITCase extends AbstractKafkaTest {
 
     @BeforeEach
     public void setUp() {
-        awssqsClient = new AWSSQSClient(service.getClient());
+        awssqsClient = new AWSSQSClient(AWSClientUtils.newSQSClient());
         queueName = AWSCommon.BASE_SQS_QUEUE_NAME + "-" + TestUtils.randomWithRange(0, 1000);
 
         queueUrl = awssqsClient.getQueue(queueName);
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/clients/AWSSDKClientUtils.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/clients/AWSSDKClientUtils.java
deleted file mode 100644
index 5fd3339..0000000
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/clients/AWSSDKClientUtils.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.kafkaconnector.aws.v2.clients;
-
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;
-import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
-import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
-import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
-import software.amazon.awssdk.services.s3.model.S3Object;
-
-public final class AWSSDKClientUtils {
-    private AWSSDKClientUtils() {
-
-    }
-
-    /**
-     * Delete an S3 bucket using the provided client. Coming from AWS documentation:
-     * https://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html
-     *
-     * AWS SDK v1 doc for reference:
-     * https://docs.aws.amazon.com/AmazonS3/latest/dev/delete-or-empty-bucket.html#delete-bucket-sdk-java
-     * @param s3Client the AmazonS3 client instance used to delete the bucket
-     * @param bucketName a String containing the bucket name
-     */
-    public static void deleteBucket(S3Client s3Client, String bucketName) {
-        // Delete all objects from the bucket. This is sufficient
-        // for non versioned buckets. For versioned buckets, when you attempt to delete objects, Amazon S3 inserts
-        // delete markers for all objects, but doesn't delete the object versions.
-        // To delete objects from versioned buckets, delete all of the object versions before deleting
-        // the bucket (see below for an example).
-        ListObjectsV2Request listObjectsRequest = ListObjectsV2Request.builder()
-                .bucket(bucketName)
-                .build();
-
-        ListObjectsV2Response objectListing;
-        do {
-            objectListing = s3Client.listObjectsV2(listObjectsRequest);
-
-            for (S3Object s3Object : objectListing.contents()) {
-                s3Client.deleteObject(DeleteObjectRequest.builder().bucket(bucketName).key(s3Object.key()).build());
-            }
-
-            listObjectsRequest = ListObjectsV2Request.builder().bucket(bucketName)
-                    .continuationToken(objectListing.nextContinuationToken())
-                    .build();
-        } while (objectListing.isTruncated());
-
-        s3Client.deleteBucket(DeleteBucketRequest.builder().bucket(bucketName).build());
-    }
-
-}
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java
index b5cca54..3c25d1b 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java
@@ -28,6 +28,7 @@ import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
 import org.apache.camel.kafkaconnector.common.utils.TestUtils;
 import org.apache.camel.test.infra.aws.common.AWSCommon;
 import org.apache.camel.test.infra.aws.common.services.AWSService;
+import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
 import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.junit.jupiter.api.AfterEach;
@@ -60,7 +61,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 @Testcontainers
 public class CamelSourceAWSKinesisITCase extends AbstractKafkaTest {
     @RegisterExtension
-    public static AWSService<KinesisClient> awsService = AWSServiceFactory.createKinesisService();
+    public static AWSService awsService = AWSServiceFactory.createKinesisService();
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSKinesisITCase.class);
 
@@ -154,7 +155,7 @@ public class CamelSourceAWSKinesisITCase extends AbstractKafkaTest {
     public void setUp() {
         streamName = AWSCommon.KINESIS_STREAM_BASE_NAME + "-" + TestUtils.randomWithRange(0, 100);
 
-        kinesisClient = awsService.getClient();
+        kinesisClient = AWSSDKClientUtils.newKinesisClient();
         received = 0;
 
         createStream();
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/source/CamelSourceAWSS3ITCase.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/source/CamelSourceAWSS3ITCase.java
index 43f1222..a02a6bd 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/source/CamelSourceAWSS3ITCase.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/source/CamelSourceAWSS3ITCase.java
@@ -22,7 +22,6 @@ import java.net.URL;
 import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 
-import org.apache.camel.kafkaconnector.aws.v2.clients.AWSSDKClientUtils;
 import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
 import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
 import org.apache.camel.kafkaconnector.common.clients.kafka.KafkaClient;
@@ -30,6 +29,7 @@ import org.apache.camel.kafkaconnector.common.utils.TestUtils;
 import org.apache.camel.test.infra.aws.common.AWSCommon;
 import org.apache.camel.test.infra.aws.common.AWSConfigs;
 import org.apache.camel.test.infra.aws.common.services.AWSService;
+import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
 import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.junit.jupiter.api.AfterEach;
@@ -43,7 +43,12 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;
+import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.S3Object;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -52,7 +57,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 public class CamelSourceAWSS3ITCase extends AbstractKafkaTest {
 
     @RegisterExtension
-    public static AWSService<S3Client> service = AWSServiceFactory.createS3Service();
+    public static AWSService service = AWSServiceFactory.createS3Service();
     private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSS3ITCase.class);
 
     private S3Client awsS3Client;
@@ -66,9 +71,44 @@ public class CamelSourceAWSS3ITCase extends AbstractKafkaTest {
         return new String[] {"camel-aws2-s3-kafka-connector"};
     }
 
+    /**
+     * Delete an S3 bucket using the provided client. Coming from AWS documentation:
+     * https://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html
+     *
+     * AWS SDK v1 doc for reference:
+     * https://docs.aws.amazon.com/AmazonS3/latest/dev/delete-or-empty-bucket.html#delete-bucket-sdk-java
+     * @param s3Client the AmazonS3 client instance used to delete the bucket
+     * @param bucketName a String containing the bucket name
+     */
+    private static void deleteBucket(S3Client s3Client, String bucketName) {
+        // Delete all objects from the bucket. This is sufficient
+        // for non versioned buckets. For versioned buckets, when you attempt to delete objects, Amazon S3 inserts
+        // delete markers for all objects, but doesn't delete the object versions.
+        // To delete objects from versioned buckets, delete all of the object versions before deleting
+        // the bucket (see below for an example).
+        ListObjectsV2Request listObjectsRequest = ListObjectsV2Request.builder()
+                .bucket(bucketName)
+                .build();
+
+        ListObjectsV2Response objectListing;
+        do {
+            objectListing = s3Client.listObjectsV2(listObjectsRequest);
+
+            for (S3Object s3Object : objectListing.contents()) {
+                s3Client.deleteObject(DeleteObjectRequest.builder().bucket(bucketName).key(s3Object.key()).build());
+            }
+
+            listObjectsRequest = ListObjectsV2Request.builder().bucket(bucketName)
+                    .continuationToken(objectListing.nextContinuationToken())
+                    .build();
+        } while (objectListing.isTruncated());
+
+        s3Client.deleteBucket(DeleteBucketRequest.builder().bucket(bucketName).build());
+    }
+
     @BeforeEach
     public void setUp() {
-        awsS3Client = service.getClient();
+        awsS3Client = AWSSDKClientUtils.newS3Client();
         received = 0;
         bucketName = AWSCommon.DEFAULT_S3_BUCKET + TestUtils.randomWithRange(0, 100);
 
@@ -87,7 +127,7 @@ public class CamelSourceAWSS3ITCase extends AbstractKafkaTest {
     @AfterEach
     public void tearDown() {
         try {
-            AWSSDKClientUtils.deleteBucket(awsS3Client, bucketName);
+            deleteBucket(awsS3Client, bucketName);
         } catch (Exception e) {
             LOG.warn("Unable to delete bucked: {}", e.getMessage(), e);
         }
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java
index 13daee7..b30deec 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java
@@ -32,6 +32,7 @@ import org.apache.camel.kafkaconnector.common.utils.TestUtils;
 import org.apache.camel.test.infra.aws.common.AWSCommon;
 import org.apache.camel.test.infra.aws.common.AWSConfigs;
 import org.apache.camel.test.infra.aws.common.services.AWSService;
+import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
 import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -44,7 +45,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.sqs.SqsClient;
 import software.amazon.awssdk.services.sqs.model.Message;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -53,7 +53,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 @Testcontainers
 public class CamelSinkAWSSQSITCase extends AbstractKafkaTest {
     @RegisterExtension
-    public static AWSService<SqsClient> awsService = AWSServiceFactory.createSQSService();
+    public static AWSService awsService = AWSServiceFactory.createSQSService();
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelSinkAWSSQSITCase.class);
 
@@ -71,7 +71,7 @@ public class CamelSinkAWSSQSITCase extends AbstractKafkaTest {
 
     @BeforeEach
     public void setUp() {
-        awssqsClient = new AWSSQSClient(awsService.getClient());
+        awssqsClient = new AWSSQSClient(AWSSDKClientUtils.newSQSClient());
 
         queueName = AWSCommon.BASE_SQS_QUEUE_NAME + "-" + TestUtils.randomWithRange(0, 1000);
         String queueUrl = awssqsClient.getOrCreateQueue(queueName);
diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java
index c2e6539..a3f2111 100644
--- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java
+++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java
@@ -28,6 +28,7 @@ import org.apache.camel.kafkaconnector.common.utils.TestUtils;
 import org.apache.camel.test.infra.aws.common.AWSCommon;
 import org.apache.camel.test.infra.aws.common.AWSConfigs;
 import org.apache.camel.test.infra.aws.common.services.AWSService;
+import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
 import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.junit.jupiter.api.AfterEach;
@@ -39,14 +40,13 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.sqs.SqsClient;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class CamelSourceAWSSQSITCase extends AbstractKafkaTest {
     @RegisterExtension
-    public static AWSService<SqsClient> service = AWSServiceFactory.createSQSService();
+    public static AWSService service = AWSServiceFactory.createSQSService();
 
     private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSSQSITCase.class);
 
@@ -63,7 +63,7 @@ public class CamelSourceAWSSQSITCase extends AbstractKafkaTest {
 
     @BeforeEach
     public void setUp() {
-        awssqsClient = new AWSSQSClient(service.getClient());
+        awssqsClient = new AWSSQSClient(AWSSDKClientUtils.newSQSClient());
         queueName = AWSCommon.BASE_SQS_QUEUE_NAME + "-" + TestUtils.randomWithRange(0, 1000);
 
         // TODO: this is a work-around for CAMEL-15833


[camel-kafka-connector] 21/21: [create-pull-request] automated change

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 3198001e89773ffe6743d20ef45ef9cff456d1cb
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Thu Nov 26 04:06:08 2020 +0000

    [create-pull-request] automated change
---
 .../generated/resources/connectors/camel-salesforce-sink.json    | 9 ++++++++-
 .../generated/resources/connectors/camel-salesforce-source.json  | 9 ++++++++-
 .../src/generated/resources/camel-salesforce-sink.json           | 9 ++++++++-
 .../src/generated/resources/camel-salesforce-source.json         | 9 ++++++++-
 .../src/main/docs/camel-salesforce-kafka-sink-connector.adoc     | 5 +++--
 .../src/main/docs/camel-salesforce-kafka-source-connector.adoc   | 5 +++--
 .../salesforce/CamelSalesforceSinkConnectorConfig.java           | 6 +++++-
 .../salesforce/CamelSalesforceSourceConnectorConfig.java         | 6 +++++-
 .../pages/connectors/camel-salesforce-kafka-sink-connector.adoc  | 5 +++--
 .../connectors/camel-salesforce-kafka-source-connector.adoc      | 5 +++--
 10 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-sink.json
index c2f48bf..035191b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-sink.json
@@ -345,6 +345,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.salesforce.httpRequestBufferSize": {
+			"name": "camel.component.salesforce.httpRequestBufferSize",
+			"description": "HTTP request buffer size. May need to be increased for large SOQL queries.",
+			"defaultValue": "\"8192\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.salesforce.includeDetails": {
 			"name": "camel.component.salesforce.includeDetails",
 			"description": "Include details in Salesforce1 Analytics report, defaults to false.",
@@ -433,7 +440,7 @@
 		},
 		"camel.component.salesforce.packages": {
 			"name": "camel.component.salesforce.packages",
-			"description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters\/header values. Multiple packages can be separated by comma.",
+			"description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. This must be set if using the XML format. Also, set it if using the generated DTOs to gain the benefit of using short SObject names in parameters\/header values. Multiple packages can be separated by comma.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-source.json
index 425fd94..c62ec18 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-source.json
@@ -363,6 +363,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.salesforce.httpRequestBufferSize": {
+			"name": "camel.component.salesforce.httpRequestBufferSize",
+			"description": "HTTP request buffer size. May need to be increased for large SOQL queries.",
+			"defaultValue": "\"8192\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.salesforce.includeDetails": {
 			"name": "camel.component.salesforce.includeDetails",
 			"description": "Include details in Salesforce1 Analytics report, defaults to false.",
@@ -451,7 +458,7 @@
 		},
 		"camel.component.salesforce.packages": {
 			"name": "camel.component.salesforce.packages",
-			"description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters\/header values. Multiple packages can be separated by comma.",
+			"description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. This must be set if using the XML format. Also, set it if using the generated DTOs to gain the benefit of using short SObject names in parameters\/header values. Multiple packages can be separated by comma.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-sink.json b/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-sink.json
index c2f48bf..035191b 100644
--- a/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-sink.json
+++ b/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-sink.json
@@ -345,6 +345,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.salesforce.httpRequestBufferSize": {
+			"name": "camel.component.salesforce.httpRequestBufferSize",
+			"description": "HTTP request buffer size. May need to be increased for large SOQL queries.",
+			"defaultValue": "\"8192\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.salesforce.includeDetails": {
 			"name": "camel.component.salesforce.includeDetails",
 			"description": "Include details in Salesforce1 Analytics report, defaults to false.",
@@ -433,7 +440,7 @@
 		},
 		"camel.component.salesforce.packages": {
 			"name": "camel.component.salesforce.packages",
-			"description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters\/header values. Multiple packages can be separated by comma.",
+			"description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. This must be set if using the XML format. Also, set it if using the generated DTOs to gain the benefit of using short SObject names in parameters\/header values. Multiple packages can be separated by comma.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-source.json b/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-source.json
index 425fd94..c62ec18 100644
--- a/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-source.json
+++ b/connectors/camel-salesforce-kafka-connector/src/generated/resources/camel-salesforce-source.json
@@ -363,6 +363,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.salesforce.httpRequestBufferSize": {
+			"name": "camel.component.salesforce.httpRequestBufferSize",
+			"description": "HTTP request buffer size. May need to be increased for large SOQL queries.",
+			"defaultValue": "\"8192\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.salesforce.includeDetails": {
 			"name": "camel.component.salesforce.includeDetails",
 			"description": "Include details in Salesforce1 Analytics report, defaults to false.",
@@ -451,7 +458,7 @@
 		},
 		"camel.component.salesforce.packages": {
 			"name": "camel.component.salesforce.packages",
-			"description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters\/header values. Multiple packages can be separated by comma.",
+			"description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. This must be set if using the XML format. Also, set it if using the generated DTOs to gain the benefit of using short SObject names in parameters\/header values. Multiple packages can be separated by comma.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
diff --git a/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-sink-connector.adoc b/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-sink-connector.adoc
index a38141e..5f73cc7 100644
--- a/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-sink-connector.adoc
+++ b/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.salesforce.CamelSalesforceSinkCo
 ----
 
 
-The camel-salesforce sink connector supports 112 options, which are listed below.
+The camel-salesforce sink connector supports 113 options, which are listed below.
 
 
 
@@ -83,6 +83,7 @@ The camel-salesforce sink connector supports 112 options, which are listed below
 | *camel.component.salesforce.httpClientConnection Timeout* | Connection timeout used by the HttpClient when connecting to the Salesforce server. | 60000L | false | MEDIUM
 | *camel.component.salesforce.httpClientIdleTimeout* | Timeout used by the HttpClient when waiting for response from the Salesforce server. | 10000L | false | MEDIUM
 | *camel.component.salesforce.httpMaxContentLength* | Max content length of an HTTP response. | null | false | MEDIUM
+| *camel.component.salesforce.httpRequestBufferSize* | HTTP request buffer size. May need to be increased for large SOQL queries. | "8192" | false | MEDIUM
 | *camel.component.salesforce.includeDetails* | Include details in Salesforce1 Analytics report, defaults to false. | null | false | MEDIUM
 | *camel.component.salesforce.initialReplayIdMap* | Replay IDs to start from per channel name. | null | false | MEDIUM
 | *camel.component.salesforce.instanceId* | Salesforce1 Analytics report execution instance ID | null | false | MEDIUM
@@ -97,7 +98,7 @@ The camel-salesforce sink connector supports 112 options, which are listed below
 | *camel.component.salesforce.notifyForOperation Undelete* | Notify for un-delete operation, defaults to false (API version = 29.0) | null | false | MEDIUM
 | *camel.component.salesforce.notifyForOperation Update* | Notify for update operation, defaults to false (API version = 29.0) | null | false | MEDIUM
 | *camel.component.salesforce.objectMapper* | Custom Jackson ObjectMapper to use when serializing/deserializing Salesforce objects. | null | false | MEDIUM
-| *camel.component.salesforce.packages* | In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | null | false | MEDIUM
+| *camel.component.salesforce.packages* | In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. This must be set if using the XML format. Also, set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | null | false | MEDIUM
 | *camel.component.salesforce.rawPayload* | Use raw payload String for request and response (either JSON or XML depending on format), instead of DTOs, false by default | false | false | MEDIUM
 | *camel.component.salesforce.reportId* | Salesforce1 Analytics report Id | null | false | MEDIUM
 | *camel.component.salesforce.reportMetadata* | Salesforce1 Analytics report metadata for filtering | null | false | MEDIUM
diff --git a/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-source-connector.adoc b/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-source-connector.adoc
index 48c45c6..f89c55b 100644
--- a/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-source-connector.adoc
+++ b/connectors/camel-salesforce-kafka-connector/src/main/docs/camel-salesforce-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.salesforce.CamelSalesforceSource
 ----
 
 
-The camel-salesforce source connector supports 115 options, which are listed below.
+The camel-salesforce source connector supports 116 options, which are listed below.
 
 
 
@@ -86,6 +86,7 @@ The camel-salesforce source connector supports 115 options, which are listed bel
 | *camel.component.salesforce.httpClientConnection Timeout* | Connection timeout used by the HttpClient when connecting to the Salesforce server. | 60000L | false | MEDIUM
 | *camel.component.salesforce.httpClientIdleTimeout* | Timeout used by the HttpClient when waiting for response from the Salesforce server. | 10000L | false | MEDIUM
 | *camel.component.salesforce.httpMaxContentLength* | Max content length of an HTTP response. | null | false | MEDIUM
+| *camel.component.salesforce.httpRequestBufferSize* | HTTP request buffer size. May need to be increased for large SOQL queries. | "8192" | false | MEDIUM
 | *camel.component.salesforce.includeDetails* | Include details in Salesforce1 Analytics report, defaults to false. | null | false | MEDIUM
 | *camel.component.salesforce.initialReplayIdMap* | Replay IDs to start from per channel name. | null | false | MEDIUM
 | *camel.component.salesforce.instanceId* | Salesforce1 Analytics report execution instance ID | null | false | MEDIUM
@@ -100,7 +101,7 @@ The camel-salesforce source connector supports 115 options, which are listed bel
 | *camel.component.salesforce.notifyForOperation Undelete* | Notify for un-delete operation, defaults to false (API version = 29.0) | null | false | MEDIUM
 | *camel.component.salesforce.notifyForOperation Update* | Notify for update operation, defaults to false (API version = 29.0) | null | false | MEDIUM
 | *camel.component.salesforce.objectMapper* | Custom Jackson ObjectMapper to use when serializing/deserializing Salesforce objects. | null | false | MEDIUM
-| *camel.component.salesforce.packages* | In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | null | false | MEDIUM
+| *camel.component.salesforce.packages* | In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. This must be set if using the XML format. Also, set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | null | false | MEDIUM
 | *camel.component.salesforce.rawPayload* | Use raw payload String for request and response (either JSON or XML depending on format), instead of DTOs, false by default | false | false | MEDIUM
 | *camel.component.salesforce.reportId* | Salesforce1 Analytics report Id | null | false | MEDIUM
 | *camel.component.salesforce.reportMetadata* | Salesforce1 Analytics report metadata for filtering | null | false | MEDIUM
diff --git a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkConnectorConfig.java b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkConnectorConfig.java
index 5dad693..e9e32b6 100644
--- a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkConnectorConfig.java
+++ b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSinkConnectorConfig.java
@@ -188,6 +188,9 @@ public class CamelSalesforceSinkConnectorConfig
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_MAX_CONTENT_LENGTH_CONF = "camel.component.salesforce.httpMaxContentLength";
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_MAX_CONTENT_LENGTH_DOC = "Max content length of an HTTP response.";
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_MAX_CONTENT_LENGTH_DEFAULT = null;
+    public static final String CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_REQUEST_BUFFER_SIZE_CONF = "camel.component.salesforce.httpRequestBufferSize";
+    public static final String CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_REQUEST_BUFFER_SIZE_DOC = "HTTP request buffer size. May need to be increased for large SOQL queries.";
+    public static final String CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_REQUEST_BUFFER_SIZE_DEFAULT = "8192";
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_INCLUDE_DETAILS_CONF = "camel.component.salesforce.includeDetails";
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_INCLUDE_DETAILS_DOC = "Include details in Salesforce1 Analytics report, defaults to false.";
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_INCLUDE_DETAILS_DEFAULT = null;
@@ -231,7 +234,7 @@ public class CamelSalesforceSinkConnectorConfig
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_OBJECT_MAPPER_DOC = "Custom Jackson ObjectMapper to use when serializing/deserializing Salesforce objects.";
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_OBJECT_MAPPER_DEFAULT = null;
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_PACKAGES_CONF = "camel.component.salesforce.packages";
-    public static final String CAMEL_SINK_SALESFORCE_COMPONENT_PACKAGES_DOC = "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma.";
+    public static final String CAMEL_SINK_SALESFORCE_COMPONENT_PACKAGES_DOC = "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. This must be set if using the XML format. Also, set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma.";
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_PACKAGES_DEFAULT = null;
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_RAW_PAYLOAD_CONF = "camel.component.salesforce.rawPayload";
     public static final String CAMEL_SINK_SALESFORCE_COMPONENT_RAW_PAYLOAD_DOC = "Use raw payload String for request and response (either JSON or XML depending on format), instead of DTOs, false by default";
@@ -429,6 +432,7 @@ public class CamelSalesforceSinkConnectorConfig
         conf.define(CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_CLIENT_CONNECTION_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_CLIENT_CONNECTION_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_CLIENT_CONNECTION_TIMEOUT_DOC);
         conf.define(CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_CLIENT_IDLE_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_CLIENT_IDLE_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_CLIENT_IDLE_TIMEOUT_DOC);
         conf.define(CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_MAX_CONTENT_LENGTH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_MAX_CONTENT_LENGTH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_MAX_CONTENT_LENGTH_DOC);
+        conf.define(CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_REQUEST_BUFFER_SIZE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_REQUEST_BUFFER_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SALESFORCE_COMPONENT_HTTP_REQUEST_BUFFER_SIZE_DOC);
         conf.define(CAMEL_SINK_SALESFORCE_COMPONENT_INCLUDE_DETAILS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SALESFORCE_COMPONENT_INCLUDE_DETAILS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SALESFORCE_COMPONENT_INCLUDE_DETAILS_DOC);
         conf.define(CAMEL_SINK_SALESFORCE_COMPONENT_INITIAL_REPLAY_ID_MAP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SALESFORCE_COMPONENT_INITIAL_REPLAY_ID_MAP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SALESFORCE_COMPONENT_INITIAL_REPLAY_ID_MAP_DOC);
         conf.define(CAMEL_SINK_SALESFORCE_COMPONENT_INSTANCE_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_SALESFORCE_COMPONENT_INSTANCE_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_SALESFORCE_COMPONENT_INSTANCE_ID_DOC);
diff --git a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceConnectorConfig.java b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceConnectorConfig.java
index 864c339..61f79ec 100644
--- a/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceConnectorConfig.java
+++ b/connectors/camel-salesforce-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/salesforce/CamelSalesforceSourceConnectorConfig.java
@@ -197,6 +197,9 @@ public class CamelSalesforceSourceConnectorConfig
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_MAX_CONTENT_LENGTH_CONF = "camel.component.salesforce.httpMaxContentLength";
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_MAX_CONTENT_LENGTH_DOC = "Max content length of an HTTP response.";
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_MAX_CONTENT_LENGTH_DEFAULT = null;
+    public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_REQUEST_BUFFER_SIZE_CONF = "camel.component.salesforce.httpRequestBufferSize";
+    public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_REQUEST_BUFFER_SIZE_DOC = "HTTP request buffer size. May need to be increased for large SOQL queries.";
+    public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_REQUEST_BUFFER_SIZE_DEFAULT = "8192";
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_INCLUDE_DETAILS_CONF = "camel.component.salesforce.includeDetails";
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_INCLUDE_DETAILS_DOC = "Include details in Salesforce1 Analytics report, defaults to false.";
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_INCLUDE_DETAILS_DEFAULT = null;
@@ -240,7 +243,7 @@ public class CamelSalesforceSourceConnectorConfig
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_OBJECT_MAPPER_DOC = "Custom Jackson ObjectMapper to use when serializing/deserializing Salesforce objects.";
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_OBJECT_MAPPER_DEFAULT = null;
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_PACKAGES_CONF = "camel.component.salesforce.packages";
-    public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_PACKAGES_DOC = "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma.";
+    public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_PACKAGES_DOC = "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. This must be set if using the XML format. Also, set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma.";
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_PACKAGES_DEFAULT = null;
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_RAW_PAYLOAD_CONF = "camel.component.salesforce.rawPayload";
     public static final String CAMEL_SOURCE_SALESFORCE_COMPONENT_RAW_PAYLOAD_DOC = "Use raw payload String for request and response (either JSON or XML depending on format), instead of DTOs, false by default";
@@ -441,6 +444,7 @@ public class CamelSalesforceSourceConnectorConfig
         conf.define(CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_CLIENT_CONNECTION_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_CLIENT_CONNECTION_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_CLIENT_CONNECTION_TIMEOUT_DOC);
         conf.define(CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_CLIENT_IDLE_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_CLIENT_IDLE_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_CLIENT_IDLE_TIMEOUT_DOC);
         conf.define(CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_MAX_CONTENT_LENGTH_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_MAX_CONTENT_LENGTH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_MAX_CONTENT_LENGTH_DOC);
+        conf.define(CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_REQUEST_BUFFER_SIZE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_REQUEST_BUFFER_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SALESFORCE_COMPONENT_HTTP_REQUEST_BUFFER_SIZE_DOC);
         conf.define(CAMEL_SOURCE_SALESFORCE_COMPONENT_INCLUDE_DETAILS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SALESFORCE_COMPONENT_INCLUDE_DETAILS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SALESFORCE_COMPONENT_INCLUDE_DETAILS_DOC);
         conf.define(CAMEL_SOURCE_SALESFORCE_COMPONENT_INITIAL_REPLAY_ID_MAP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SALESFORCE_COMPONENT_INITIAL_REPLAY_ID_MAP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SALESFORCE_COMPONENT_INITIAL_REPLAY_ID_MAP_DOC);
         conf.define(CAMEL_SOURCE_SALESFORCE_COMPONENT_INSTANCE_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_SALESFORCE_COMPONENT_INSTANCE_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_SALESFORCE_COMPONENT_INSTANCE_ID_DOC);
diff --git a/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-sink-connector.adoc
index a38141e..5f73cc7 100644
--- a/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.salesforce.CamelSalesforceSinkCo
 ----
 
 
-The camel-salesforce sink connector supports 112 options, which are listed below.
+The camel-salesforce sink connector supports 113 options, which are listed below.
 
 
 
@@ -83,6 +83,7 @@ The camel-salesforce sink connector supports 112 options, which are listed below
 | *camel.component.salesforce.httpClientConnection Timeout* | Connection timeout used by the HttpClient when connecting to the Salesforce server. | 60000L | false | MEDIUM
 | *camel.component.salesforce.httpClientIdleTimeout* | Timeout used by the HttpClient when waiting for response from the Salesforce server. | 10000L | false | MEDIUM
 | *camel.component.salesforce.httpMaxContentLength* | Max content length of an HTTP response. | null | false | MEDIUM
+| *camel.component.salesforce.httpRequestBufferSize* | HTTP request buffer size. May need to be increased for large SOQL queries. | "8192" | false | MEDIUM
 | *camel.component.salesforce.includeDetails* | Include details in Salesforce1 Analytics report, defaults to false. | null | false | MEDIUM
 | *camel.component.salesforce.initialReplayIdMap* | Replay IDs to start from per channel name. | null | false | MEDIUM
 | *camel.component.salesforce.instanceId* | Salesforce1 Analytics report execution instance ID | null | false | MEDIUM
@@ -97,7 +98,7 @@ The camel-salesforce sink connector supports 112 options, which are listed below
 | *camel.component.salesforce.notifyForOperation Undelete* | Notify for un-delete operation, defaults to false (API version = 29.0) | null | false | MEDIUM
 | *camel.component.salesforce.notifyForOperation Update* | Notify for update operation, defaults to false (API version = 29.0) | null | false | MEDIUM
 | *camel.component.salesforce.objectMapper* | Custom Jackson ObjectMapper to use when serializing/deserializing Salesforce objects. | null | false | MEDIUM
-| *camel.component.salesforce.packages* | In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | null | false | MEDIUM
+| *camel.component.salesforce.packages* | In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. This must be set if using the XML format. Also, set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | null | false | MEDIUM
 | *camel.component.salesforce.rawPayload* | Use raw payload String for request and response (either JSON or XML depending on format), instead of DTOs, false by default | false | false | MEDIUM
 | *camel.component.salesforce.reportId* | Salesforce1 Analytics report Id | null | false | MEDIUM
 | *camel.component.salesforce.reportMetadata* | Salesforce1 Analytics report metadata for filtering | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-source-connector.adoc
index 48c45c6..f89c55b 100644
--- a/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-salesforce-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.salesforce.CamelSalesforceSource
 ----
 
 
-The camel-salesforce source connector supports 115 options, which are listed below.
+The camel-salesforce source connector supports 116 options, which are listed below.
 
 
 
@@ -86,6 +86,7 @@ The camel-salesforce source connector supports 115 options, which are listed bel
 | *camel.component.salesforce.httpClientConnection Timeout* | Connection timeout used by the HttpClient when connecting to the Salesforce server. | 60000L | false | MEDIUM
 | *camel.component.salesforce.httpClientIdleTimeout* | Timeout used by the HttpClient when waiting for response from the Salesforce server. | 10000L | false | MEDIUM
 | *camel.component.salesforce.httpMaxContentLength* | Max content length of an HTTP response. | null | false | MEDIUM
+| *camel.component.salesforce.httpRequestBufferSize* | HTTP request buffer size. May need to be increased for large SOQL queries. | "8192" | false | MEDIUM
 | *camel.component.salesforce.includeDetails* | Include details in Salesforce1 Analytics report, defaults to false. | null | false | MEDIUM
 | *camel.component.salesforce.initialReplayIdMap* | Replay IDs to start from per channel name. | null | false | MEDIUM
 | *camel.component.salesforce.instanceId* | Salesforce1 Analytics report execution instance ID | null | false | MEDIUM
@@ -100,7 +101,7 @@ The camel-salesforce source connector supports 115 options, which are listed bel
 | *camel.component.salesforce.notifyForOperation Undelete* | Notify for un-delete operation, defaults to false (API version = 29.0) | null | false | MEDIUM
 | *camel.component.salesforce.notifyForOperation Update* | Notify for update operation, defaults to false (API version = 29.0) | null | false | MEDIUM
 | *camel.component.salesforce.objectMapper* | Custom Jackson ObjectMapper to use when serializing/deserializing Salesforce objects. | null | false | MEDIUM
-| *camel.component.salesforce.packages* | In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | null | false | MEDIUM
+| *camel.component.salesforce.packages* | In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. This must be set if using the XML format. Also, set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values. Multiple packages can be separated by comma. | null | false | MEDIUM
 | *camel.component.salesforce.rawPayload* | Use raw payload String for request and response (either JSON or XML depending on format), instead of DTOs, false by default | false | false | MEDIUM
 | *camel.component.salesforce.reportId* | Salesforce1 Analytics report Id | null | false | MEDIUM
 | *camel.component.salesforce.reportMetadata* | Salesforce1 Analytics report metadata for filtering | null | false | MEDIUM


[camel-kafka-connector] 03/21: [create-pull-request] automated change

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 72b7670935d2280a6183051c675e0a4ce685d771
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Sun Nov 8 03:30:51 2020 +0000

    [create-pull-request] automated change
---
 .../resources/connectors/camel-aws2-sqs-sink.json  |  14 ++
 .../connectors/camel-aws2-sqs-source.json          |  14 ++
 .../connectors/camel-azure-storage-blob-sink.json  |  12 ++
 .../camel-azure-storage-blob-source.json           |  12 ++
 .../resources/connectors/camel-couchbase-sink.json |   4 +-
 .../connectors/camel-couchbase-source.json         |   4 +-
 .../resources/connectors/camel-git-sink.json       |  40 ++--
 .../resources/connectors/camel-git-source.json     |  30 ---
 .../resources/connectors/camel-grpc-sink.json      |   7 +
 .../resources/connectors/camel-grpc-source.json    |  14 ++
 .../resources/connectors/camel-kafka-sink.json     |  24 +--
 .../resources/connectors/camel-kafka-source.json   |  24 +--
 .../camel-kubernetes-deployments-source.json       |  30 +++
 .../connectors/camel-kubernetes-hpa-source.json    |  30 +++
 .../connectors/camel-kubernetes-job-source.json    |  30 +++
 .../camel-kubernetes-namespaces-source.json        |  30 +++
 .../connectors/camel-kubernetes-nodes-source.json  |  30 +++
 .../connectors/camel-kubernetes-pods-source.json   |  30 +++
 ...-kubernetes-replication-controllers-source.json |  30 +++
 .../camel-kubernetes-services-source.json          |  30 +++
 .../resources/connectors/camel-pulsar-source.json  |  14 ++
 .../connectors/camel-vertx-websocket-sink.json     |   6 +
 .../resources/descriptors/connectors.properties    |   3 +
 connectors/camel-atlasmap-kafka-connector/pom.xml  | 135 ++++++++++++++
 .../descriptors/connector-sink.properties          |   1 +
 .../generated/resources/camel-atlasmap-sink.json   |  99 ++++++++++
 .../src/main/assembly/package.xml                  |  57 ++++++
 .../docs/camel-atlasmap-kafka-sink-connector.adoc  |  66 +++++++
 .../CamelAtlasmapSinkConnector.properties}         |  10 +-
 .../atlasmap/CamelAtlasmapSinkConnector.java       |  35 ++++
 .../atlasmap/CamelAtlasmapSinkConnectorConfig.java |  96 ++++++++++
 .../atlasmap/CamelAtlasmapSinkTask.java            |  39 ++++
 .../src/main/resources/META-INF/LICENSE.txt        | 203 +++++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt         |  11 ++
 .../generated/resources/camel-aws2-sqs-sink.json   |  14 ++
 .../generated/resources/camel-aws2-sqs-source.json |  14 ++
 .../docs/camel-aws2-sqs-kafka-sink-connector.adoc  |   4 +-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |   4 +-
 .../aws2sqs/CamelAws2sqsSinkConnectorConfig.java   |   8 +
 .../aws2sqs/CamelAws2sqsSourceConnectorConfig.java |   8 +
 .../resources/camel-azure-storage-blob-sink.json   |  12 ++
 .../resources/camel-azure-storage-blob-source.json |  12 ++
 ...el-azure-storage-blob-kafka-sink-connector.adoc |   4 +-
 ...-azure-storage-blob-kafka-source-connector.adoc |   4 +-
 .../CamelAzurestorageblobSinkConnectorConfig.java  |   8 +
 ...CamelAzurestorageblobSourceConnectorConfig.java |   8 +
 .../generated/resources/camel-couchbase-sink.json  |   4 +-
 .../resources/camel-couchbase-source.json          |   4 +-
 .../docs/camel-couchbase-kafka-sink-connector.adoc |   2 +-
 .../camel-couchbase-kafka-source-connector.adoc    |   2 +-
 .../CamelCouchbaseSinkConnector.properties         |   2 +
 .../CamelCouchbaseSourceConnector.properties       |   2 +
 .../CamelCouchbaseSinkConnectorConfig.java         |   2 +-
 .../CamelCouchbaseSourceConnectorConfig.java       |   2 +-
 .../src/generated/resources/camel-git-sink.json    |  40 ++--
 .../src/generated/resources/camel-git-source.json  |  30 ---
 .../main/docs/camel-git-kafka-sink-connector.adoc  |   6 +-
 .../docs/camel-git-kafka-source-connector.adoc     |   7 +-
 .../git/CamelGitSinkConnectorConfig.java           |  24 +--
 .../git/CamelGitSourceConnectorConfig.java         |  20 --
 .../src/generated/resources/camel-grpc-sink.json   |   7 +
 .../src/generated/resources/camel-grpc-source.json |  14 ++
 .../main/docs/camel-grpc-kafka-sink-connector.adoc |   3 +-
 .../docs/camel-grpc-kafka-source-connector.adoc    |   4 +-
 .../grpc/CamelGrpcSinkConnectorConfig.java         |   4 +
 .../grpc/CamelGrpcSourceConnectorConfig.java       |   8 +
 .../src/generated/resources/camel-kafka-sink.json  |  24 +--
 .../generated/resources/camel-kafka-source.json    |  24 +--
 .../docs/camel-kafka-kafka-sink-connector.adoc     |  12 +-
 .../docs/camel-kafka-kafka-source-connector.adoc   |   4 +-
 .../kafka/CamelKafkaSinkConnectorConfig.java       |  48 ++---
 .../kafka/CamelKafkaSourceConnectorConfig.java     |  16 +-
 .../pom.xml                                        | 135 ++++++++++++++
 .../descriptors/connector-sink.properties          |   1 +
 .../descriptors/connector-source.properties        |   1 +
 .../camel-kubernetes-custom-resources-sink.json    | 163 +++++++++--------
 .../camel-kubernetes-custom-resources-source.json  |  48 ++++-
 .../src/main/assembly/package.xml                  |  57 ++++++
 ...etes-custom-resources-kafka-sink-connector.adoc |  78 ++++++++
 ...s-custom-resources-kafka-source-connector.adoc} |  31 ++--
 ...ernetescustomresourcesSinkConnector.properties} |  10 +-
 ...netescustomresourcesSourceConnector.properties} |  10 +-
 ...amelKubernetescustomresourcesSinkConnector.java |  37 ++++
 ...bernetescustomresourcesSinkConnectorConfig.java | 145 +++++++++++++++
 .../CamelKubernetescustomresourcesSinkTask.java    |  39 ++++
 ...elKubernetescustomresourcesSourceConnector.java |  37 ++++
 ...rnetescustomresourcesSourceConnectorConfig.java | 189 +++++++++++++++++++
 .../CamelKubernetescustomresourcesSourceTask.java  |  39 ++++
 .../src/main/resources/META-INF/LICENSE.txt        | 203 +++++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt         |  11 ++
 .../camel-kubernetes-deployments-source.json       |  30 +++
 ...ernetes-deployments-kafka-source-connector.adoc |   7 +-
 ...KubernetesdeploymentsSourceConnectorConfig.java |  20 ++
 .../resources/camel-kubernetes-hpa-source.json     |  30 +++
 ...amel-kubernetes-hpa-kafka-source-connector.adoc |   7 +-
 .../CamelKuberneteshpaSourceConnectorConfig.java   |  20 ++
 .../resources/camel-kubernetes-job-source.json     |  30 +++
 ...amel-kubernetes-job-kafka-source-connector.adoc |   7 +-
 .../CamelKubernetesjobSourceConnectorConfig.java   |  20 ++
 .../camel-kubernetes-namespaces-source.json        |  30 +++
 ...bernetes-namespaces-kafka-source-connector.adoc |   7 +-
 ...lKubernetesnamespacesSourceConnectorConfig.java |  20 ++
 .../resources/camel-kubernetes-nodes-source.json   |  30 +++
 ...el-kubernetes-nodes-kafka-source-connector.adoc |   7 +-
 .../CamelKubernetesnodesSourceConnectorConfig.java |  20 ++
 .../resources/camel-kubernetes-pods-source.json    |  30 +++
 ...mel-kubernetes-pods-kafka-source-connector.adoc |   7 +-
 .../CamelKubernetespodsSourceConnectorConfig.java  |  20 ++
 ...-kubernetes-replication-controllers-source.json |  30 +++
 ...ication-controllers-kafka-source-connector.adoc |   7 +-
 ...eplicationcontrollersSourceConnectorConfig.java |  20 ++
 .../camel-kubernetes-services-source.json          |  30 +++
 ...kubernetes-services-kafka-source-connector.adoc |   7 +-
 ...melKubernetesservicesSourceConnectorConfig.java |  20 ++
 .../generated/resources/camel-pulsar-source.json   |  14 ++
 .../docs/camel-pulsar-kafka-source-connector.adoc  |   4 +-
 .../pulsar/CamelPulsarSourceConnectorConfig.java   |   8 +
 .../resources/camel-vertx-websocket-sink.json      |   6 +
 ...camel-vertx-websocket-kafka-sink-connector.adoc |   3 +-
 .../CamelVertxwebsocketSinkConnectorConfig.java    |   4 +
 connectors/pom.xml                                 |   2 +
 .../camel-atlasmap-kafka-sink-connector.adoc       |  66 +++++++
 .../camel-aws2-sqs-kafka-sink-connector.adoc       |   4 +-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |   4 +-
 ...el-azure-storage-blob-kafka-sink-connector.adoc |   4 +-
 ...-azure-storage-blob-kafka-source-connector.adoc |   4 +-
 .../camel-couchbase-kafka-sink-connector.adoc      |   2 +-
 .../camel-couchbase-kafka-source-connector.adoc    |   2 +-
 .../connectors/camel-git-kafka-sink-connector.adoc |   6 +-
 .../camel-git-kafka-source-connector.adoc          |   7 +-
 .../camel-grpc-kafka-sink-connector.adoc           |   3 +-
 .../camel-grpc-kafka-source-connector.adoc         |   4 +-
 .../camel-kafka-kafka-sink-connector.adoc          |  12 +-
 .../camel-kafka-kafka-source-connector.adoc        |   4 +-
 ...etes-custom-resources-kafka-sink-connector.adoc |  78 ++++++++
 ...es-custom-resources-kafka-source-connector.adoc |  31 ++--
 ...ernetes-deployments-kafka-source-connector.adoc |   7 +-
 ...amel-kubernetes-hpa-kafka-source-connector.adoc |   7 +-
 ...amel-kubernetes-job-kafka-source-connector.adoc |   7 +-
 ...bernetes-namespaces-kafka-source-connector.adoc |   7 +-
 ...el-kubernetes-nodes-kafka-source-connector.adoc |   7 +-
 ...mel-kubernetes-pods-kafka-source-connector.adoc |   7 +-
 ...ication-controllers-kafka-source-connector.adoc |   7 +-
 ...kubernetes-services-kafka-source-connector.adoc |   7 +-
 .../camel-pulsar-kafka-source-connector.adoc       |   4 +-
 ...camel-vertx-websocket-kafka-sink-connector.adoc |   3 +-
 146 files changed, 3234 insertions(+), 420 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
index 964f356..35164dc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
@@ -81,6 +81,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.useIAMCredentials": {
+			"name": "camel.sink.endpoint.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.delaySeconds": {
 			"name": "camel.sink.endpoint.delaySeconds",
 			"description": "Delay sending messages for a number of seconds.",
@@ -260,6 +267,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.useIAMCredentials": {
+			"name": "camel.component.aws2-sqs.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.delaySeconds": {
 			"name": "camel.component.aws2-sqs.delaySeconds",
 			"description": "Delay sending messages for a number of seconds.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
index c819570..7684b15 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
@@ -81,6 +81,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.useIAMCredentials": {
+			"name": "camel.source.endpoint.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.attributeNames": {
 			"name": "camel.source.endpoint.attributeNames",
 			"description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma.",
@@ -436,6 +443,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.useIAMCredentials": {
+			"name": "camel.component.aws2-sqs.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.attributeNames": {
 			"name": "camel.component.aws2-sqs.attributeNames",
 			"description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json
index fe3b13d..fcf267d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json
@@ -98,6 +98,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.regex": {
+			"name": "camel.sink.endpoint.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.serviceClient": {
 			"name": "camel.sink.endpoint.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
@@ -276,6 +282,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.azure-storage-blob.regex": {
+			"name": "camel.component.azure-storage-blob.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.azure-storage-blob.serviceClient": {
 			"name": "camel.component.azure-storage-blob.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json
index 92bdb2f..26374df 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json
@@ -98,6 +98,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.regex": {
+			"name": "camel.source.endpoint.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.serviceClient": {
 			"name": "camel.source.endpoint.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
@@ -226,6 +232,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.azure-storage-blob.regex": {
+			"name": "camel.component.azure-storage-blob.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.azure-storage-blob.serviceClient": {
 			"name": "camel.component.azure-storage-blob.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
index 4fe21c2..0d2f926 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
@@ -31,8 +31,8 @@
 		"camel.sink.endpoint.bucket": {
 			"name": "camel.sink.endpoint.bucket",
 			"description": "The bucket to use",
-			"priority": "MEDIUM",
-			"required": "false"
+			"priority": "HIGH",
+			"required": "true"
 		},
 		"camel.sink.endpoint.collection": {
 			"name": "camel.sink.endpoint.collection",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json
index f592523..59fba50 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json
@@ -31,8 +31,8 @@
 		"camel.source.endpoint.bucket": {
 			"name": "camel.source.endpoint.bucket",
 			"description": "The bucket to use",
-			"priority": "MEDIUM",
-			"required": "false"
+			"priority": "HIGH",
+			"required": "true"
 		},
 		"camel.source.endpoint.collection": {
 			"name": "camel.source.endpoint.collection",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json
index 6fd403c..bea3a4b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json
@@ -21,6 +21,26 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.allowEmpty": {
+			"name": "camel.sink.endpoint.allowEmpty",
+			"description": "The flag to manage empty git commits",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.lazyStartProducer": {
+			"name": "camel.sink.endpoint.lazyStartProducer",
+			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.operation": {
+			"name": "camel.sink.endpoint.operation",
+			"description": "The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList]",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.password": {
 			"name": "camel.sink.endpoint.password",
 			"description": "Remote repository password",
@@ -51,26 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.allowEmpty": {
-			"name": "camel.sink.endpoint.allowEmpty",
-			"description": "The flag to manage empty git commits",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.lazyStartProducer": {
-			"name": "camel.sink.endpoint.lazyStartProducer",
-			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.operation": {
-			"name": "camel.sink.endpoint.operation",
-			"description": "The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList]",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.basicPropertyBinding": {
 			"name": "camel.sink.endpoint.basicPropertyBinding",
 			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json
index 6324c50..a7f7dcd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json
@@ -21,36 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.password": {
-			"name": "camel.source.endpoint.password",
-			"description": "Remote repository password",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.remoteName": {
-			"name": "camel.source.endpoint.remoteName",
-			"description": "The remote repository name to use in particular operation like pull",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.remotePath": {
-			"name": "camel.source.endpoint.remotePath",
-			"description": "The remote repository path",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.tagName": {
-			"name": "camel.source.endpoint.tagName",
-			"description": "The tag name to work on",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.username": {
-			"name": "camel.source.endpoint.username",
-			"description": "Remote repository username",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bridgeErrorHandler": {
 			"name": "camel.source.endpoint.bridgeErrorHandler",
 			"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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json
index 48dea76..fac545a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json
@@ -27,6 +27,13 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.sink.endpoint.autoDiscoverClientInterceptors": {
+			"name": "camel.sink.endpoint.autoDiscoverClientInterceptors",
+			"description": "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.flowControlWindow": {
 			"name": "camel.sink.endpoint.flowControlWindow",
 			"description": "The HTTP\/2 flow control window size (MiB)",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json
index cbe6e50..7233809 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json
@@ -27,6 +27,13 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.source.endpoint.autoDiscoverClientInterceptors": {
+			"name": "camel.source.endpoint.autoDiscoverClientInterceptors",
+			"description": "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.flowControlWindow": {
 			"name": "camel.source.endpoint.flowControlWindow",
 			"description": "The HTTP\/2 flow control window size (MiB)",
@@ -76,6 +83,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.routeControlledStreamObserver": {
+			"name": "camel.source.endpoint.routeControlledStreamObserver",
+			"description": "Lets the route to take control over stream observer. If this value is set to true, then the response observer of gRPC call will be set with the name GrpcConstants.GRPC_RESPONSE_OBSERVER in the Exchange object. Please note that the stream observer's onNext(), onError(), onCompleted() methods should be called in the route.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.exceptionHandler": {
 			"name": "camel.source.endpoint.exceptionHandler",
 			"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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json
index e1ab101..d5b3d67 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json
@@ -81,8 +81,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.kafkaHeaderSerializer": {
-			"name": "camel.sink.endpoint.kafkaHeaderSerializer",
+		"camel.sink.endpoint.headerSerializer": {
+			"name": "camel.sink.endpoint.headerSerializer",
 			"description": "To use a custom KafkaHeaderSerializer to serialize kafka headers values",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -93,8 +93,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.keySerializerClass": {
-			"name": "camel.sink.endpoint.keySerializerClass",
+		"camel.sink.endpoint.keySerializer": {
+			"name": "camel.sink.endpoint.keySerializer",
 			"description": "The serializer class for keys (defaults to the same as for messages if nothing is given).",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
@@ -245,8 +245,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.serializerClass": {
-			"name": "camel.sink.endpoint.serializerClass",
+		"camel.sink.endpoint.valueSerializer": {
+			"name": "camel.sink.endpoint.valueSerializer",
 			"description": "The serializer class for messages.",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
@@ -526,8 +526,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.kafkaHeaderSerializer": {
-			"name": "camel.component.kafka.kafkaHeaderSerializer",
+		"camel.component.kafka.headerSerializer": {
+			"name": "camel.component.kafka.headerSerializer",
 			"description": "To use a custom KafkaHeaderSerializer to serialize kafka headers values",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -538,8 +538,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.keySerializerClass": {
-			"name": "camel.component.kafka.keySerializerClass",
+		"camel.component.kafka.keySerializer": {
+			"name": "camel.component.kafka.keySerializer",
 			"description": "The serializer class for keys (defaults to the same as for messages if nothing is given).",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
@@ -690,8 +690,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.serializerClass": {
-			"name": "camel.component.kafka.serializerClass",
+		"camel.component.kafka.valueSerializer": {
+			"name": "camel.component.kafka.valueSerializer",
 			"description": "The serializer class for messages.",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
index bdf0daa..d2d7b87 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
@@ -157,6 +157,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.headerDeserializer": {
+			"name": "camel.source.endpoint.headerDeserializer",
+			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.heartbeatIntervalMs": {
 			"name": "camel.source.endpoint.heartbeatIntervalMs",
 			"description": "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1\/3 of that value. It can be adjusted even lower to control the expected time for normal rebalances.",
@@ -164,12 +170,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.kafkaHeaderDeserializer": {
-			"name": "camel.source.endpoint.kafkaHeaderDeserializer",
-			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.keyDeserializer": {
 			"name": "camel.source.endpoint.keyDeserializer",
 			"description": "Deserializer class for key that implements the Deserializer interface.",
@@ -563,6 +563,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.kafka.headerDeserializer": {
+			"name": "camel.component.kafka.headerDeserializer",
+			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.kafka.heartbeatIntervalMs": {
 			"name": "camel.component.kafka.heartbeatIntervalMs",
 			"description": "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1\/3 of that value. It can be adjusted even lower to control the expected time for normal rebalances.",
@@ -570,12 +576,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.kafkaHeaderDeserializer": {
-			"name": "camel.component.kafka.kafkaHeaderDeserializer",
-			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.kafka.keyDeserializer": {
 			"name": "camel.component.kafka.keyDeserializer",
 			"description": "Deserializer class for key that implements the Deserializer interface.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json
index 2d6443f..bfb7af9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
index 0088ab1..d88584c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json
index 0de6735..dcea34d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json
index 80f11cd..a38bb65 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json
index 6cafbfe..320bb79 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json
index 983d302..1679e6e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json
index 878a9ca..693f9c0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json
index c889b93..0151fa7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json
index e6e4bbc..36414b3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json
@@ -108,6 +108,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.readCompacted": {
+			"name": "camel.source.endpoint.readCompacted",
+			"description": "Enable compacted topic reading.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.subscriptionInitialPosition": {
 			"name": "camel.source.endpoint.subscriptionInitialPosition",
 			"description": "Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST]",
@@ -250,6 +257,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.pulsar.readCompacted": {
+			"name": "camel.component.pulsar.readCompacted",
+			"description": "Enable compacted topic reading.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.pulsar.subscriptionInitialPosition": {
 			"name": "camel.component.pulsar.subscriptionInitialPosition",
 			"description": "Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST]",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
index 4653fa2..e1bc267 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
@@ -36,6 +36,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.clientSubProtocols": {
+			"name": "camel.sink.endpoint.clientSubProtocols",
+			"description": "Comma separated list of WebSocket subprotocols that the client should use for the Sec-WebSocket-Protocol header",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
diff --git a/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties b/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
index 6df3a8c..e95881f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
+++ b/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
@@ -14,6 +14,7 @@ camel-as2-source
 camel-as2-sink
 camel-asterisk-source
 camel-asterisk-sink
+camel-atlasmap-sink
 camel-atmos-source
 camel-atmos-sink
 camel-atmosphere-websocket-source
@@ -290,6 +291,8 @@ camel-jt400-sink
 camel-kafka-source
 camel-kafka-sink
 camel-kubernetes-config-maps-sink
+camel-kubernetes-custom-resources-source
+camel-kubernetes-custom-resources-sink
 camel-kubernetes-deployments-source
 camel-kubernetes-deployments-sink
 camel-kubernetes-hpa-source
diff --git a/connectors/camel-atlasmap-kafka-connector/pom.xml b/connectors/camel-atlasmap-kafka-connector/pom.xml
new file mode 100644
index 0000000..e9d76b9
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.camel.kafkaconnector</groupId>
+    <artifactId>connectors</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>camel-atlasmap-kafka-connector</artifactId>
+  <name>Camel-Kafka-Connector :: atlasmap</name>
+  <description>Camel Kafka Connector for atlasmap</description>
+  <dependencies>
+    <!-- Kafka -->
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-transforms</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Camel -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-atlasmap</artifactId>
+    </dependency>
+    <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel.kafkaconnector</groupId>
+      <artifactId>camel-kafka-connector</artifactId>
+    </dependency>
+    <!--END OF GENERATED CODE-->
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${version.maven.surefire.plugin}</version>
+        <configuration>
+          <failIfNoTests>false</failIfNoTests>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${version.maven.jar}</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.5.3</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/package.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <!--START OF GENERATED CODE-->
+  <repositories>
+    <!-- camel-jira -->
+    <repository>
+      <id>atlassian-public</id>
+      <url>https://packages.atlassian.com/maven-external</url>
+      <name>Atlassian Public Repo</name>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <!-- camel-ipfs and camel-weka -->
+    <repository>
+      <id>jboss.thirdparty</id>
+      <name>JBoss Thirdparty Repository</name>
+      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  <!--END OF GENERATED CODE-->
+</project>
diff --git a/connectors/camel-atlasmap-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-atlasmap-kafka-connector/src/generated/descriptors/connector-sink.properties
new file mode 100644
index 0000000..43d1b55
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/generated/descriptors/connector-sink.properties
@@ -0,0 +1 @@
+camel-atlasmap-sink
\ No newline at end of file
diff --git a/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json b/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json
new file mode 100644
index 0000000..5bf8f40
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json
@@ -0,0 +1,99 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.atlasmap.CamelAtlasmapSinkConnector",
+		"artifactId": "camel-atlasmap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-atlasmap-sink",
+		"type": "sink",
+		"version": "0.7.0-SNAPSHOT",
+		"description": "Transforms the message using an AtlasMap transformation."
+	},
+	"properties": {
+		"camel.sink.path.resourceUri": {
+			"name": "camel.sink.path.resourceUri",
+			"description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.sink.endpoint.allowContextMapAll": {
+			"name": "camel.sink.endpoint.allowContextMapAll",
+			"description": "Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.contentCache": {
+			"name": "camel.sink.endpoint.contentCache",
+			"description": "Sets whether to use resource content cache or not",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.lazyStartProducer": {
+			"name": "camel.sink.endpoint.lazyStartProducer",
+			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.sourceMapName": {
+			"name": "camel.sink.endpoint.sourceMapName",
+			"description": "The Exchange property name for a source message map which hold java.util.Map&lt;String, Message&gt; where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source properties where the scope equals to Document ID.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.targetMapMode": {
+			"name": "camel.sink.endpoint.targetMapMode",
+			"description": "TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores them into a java.util.Map, and the java.util.Map is set to an exchange property if 'targetMapName' is specified, otherwise message body. 'MESSAGE_HEADER': Stores them into message headers. 'EXCHANGE_PROPERTY': Stores them into exchange properties. ) One of: [MAP] [MESSAGE_HEADER] [EXCHANGE_PROPERTY]",
+			"defaultValue": "\"MAP\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.targetMapName": {
+			"name": "camel.sink.endpoint.targetMapName",
+			"description": "The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.basicPropertyBinding": {
+			"name": "camel.sink.endpoint.basicPropertyBinding",
+			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.propertiesFile": {
+			"name": "camel.sink.endpoint.propertiesFile",
+			"description": "The URI of the properties file which is used for AtlasContextFactory initialization.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.synchronous": {
+			"name": "camel.sink.endpoint.synchronous",
+			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.atlasmap.lazyStartProducer": {
+			"name": "camel.component.atlasmap.lazyStartProducer",
+			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.atlasmap.atlasContextFactory": {
+			"name": "camel.component.atlasmap.atlasContextFactory",
+			"description": "To use the AtlasContextFactory otherwise a new engine is created.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.atlasmap.basicPropertyBinding": {
+			"name": "camel.component.atlasmap.basicPropertyBinding",
+			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+			"defaultValue": "false",
+			"priority": "LOW",
+			"required": "false"
+		}
+	}
+}
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/assembly/package.xml b/connectors/camel-atlasmap-kafka-connector/src/main/assembly/package.xml
new file mode 100644
index 0000000..4fd2529
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/assembly/package.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<assembly>
+  <!-- Assembles a packaged version targeting OS installation. -->
+  <id>package</id>
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/../..</directory>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>licenses/</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/src/main/docs</directory>
+      <outputDirectory>docs/</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <excludes>
+        <exclude>org.apache.kafka:connect-api</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc b/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc
new file mode 100644
index 0000000..72187e3
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc
@@ -0,0 +1,66 @@
+// kafka-connector options: START
+[[camel-atlasmap-kafka-connector-sink]]
+= camel-atlasmap-kafka-connector sink configuration
+
+When using camel-atlasmap-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-atlasmap-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.atlasmap.CamelAtlasmapSinkConnector
+----
+
+
+The camel-atlasmap sink connector supports 13 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.resourceUri* | Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod. | null | true | HIGH
+| *camel.sink.endpoint.allowContextMapAll* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | false | MEDIUM
+| *camel.sink.endpoint.contentCache* | Sets whether to use resource content cache or not | false | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
+| *camel.sink.endpoint.sourceMapName* | The Exchange property name for a source message map which hold java.util.Map&lt;String, Message&gt; where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source properties where the scope equals to Document ID. | null | false | MEDIUM
+| *camel.sink.endpoint.targetMapMode* | TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores them into a java.util.Map, and the java.util.Map is set to an exchange property if 'targetMapName' is specified, otherwise message body. 'MESSAGE_HEADER': Stores them into message headers. 'EXCHANGE_PROPERTY': Stores them into exchange properties. ) One of: [MAP] [MESSAGE_HEADER] [EXCHANGE_PROPERTY] | "MAP" | false | MEDIUM
+| *camel.sink.endpoint.targetMapName* | The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map. | null | false | MEDIUM
+| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
+| *camel.sink.endpoint.propertiesFile* | The URI of the properties file which is used for AtlasContextFactory initialization. | null | false | MEDIUM
+| *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
+| *camel.component.atlasmap.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
+| *camel.component.atlasmap.atlasContextFactory* | To use the AtlasContextFactory otherwise a new engine is created. | null | false | MEDIUM
+| *camel.component.atlasmap.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+|===
+
+
+
+The camel-atlasmap sink connector has no converters out of the box.
+
+
+
+
+
+The camel-atlasmap sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-atlasmap sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties b/connectors/camel-atlasmap-kafka-connector/src/main/docs/examples/CamelAtlasmapSinkConnector.properties
similarity index 72%
copy from connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
copy to connectors/camel-atlasmap-kafka-connector/src/main/docs/examples/CamelAtlasmapSinkConnector.properties
index fdebdc2..7edb47ce 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/docs/examples/CamelAtlasmapSinkConnector.properties
@@ -15,8 +15,8 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-name=CamelCouchbaseSinkConnector
-connector.class=org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSinkConnector
+name=CamelAtlasmapSinkConnector
+connector.class=org.apache.camel.kafkaconnector.atlasmap.CamelAtlasmapSinkConnector
 tasks.max=1
 
 # use the kafka converters that better suit your needs, these are just defaults:
@@ -28,8 +28,6 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The hostname to use
-camel.sink.path.hostname=
-# The protocol to use
-camel.sink.path.protocol=
+# Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod.
+camel.sink.path.resourceUri=
 
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnector.java b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnector.java
new file mode 100644
index 0000000..68ba548
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnector.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.atlasmap;
+
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.Task;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAtlasmapSinkConnector extends CamelSinkConnector {
+
+    @Override
+    public ConfigDef config() {
+        return CamelAtlasmapSinkConnectorConfig.conf();
+    }
+    @Override
+    public Class<? extends Task> taskClass() {
+        return CamelAtlasmapSinkTask.class;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java
new file mode 100644
index 0000000..1e0a715
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.atlasmap;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAtlasmapSinkConnectorConfig
+        extends
+            CamelSinkConnectorConfig {
+
+    public static final String CAMEL_SINK_ATLASMAP_PATH_RESOURCE_URI_CONF = "camel.sink.path.resourceUri";
+    public static final String CAMEL_SINK_ATLASMAP_PATH_RESOURCE_URI_DOC = "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod.";
+    public static final String CAMEL_SINK_ATLASMAP_PATH_RESOURCE_URI_DEFAULT = null;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_ALLOW_CONTEXT_MAP_ALL_CONF = "camel.sink.endpoint.allowContextMapAll";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_ALLOW_CONTEXT_MAP_ALL_DOC = "Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API.";
+    public static final Boolean CAMEL_SINK_ATLASMAP_ENDPOINT_ALLOW_CONTEXT_MAP_ALL_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_CONTENT_CACHE_CONF = "camel.sink.endpoint.contentCache";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_CONTENT_CACHE_DOC = "Sets whether to use resource content cache or not";
+    public static final Boolean CAMEL_SINK_ATLASMAP_ENDPOINT_CONTENT_CACHE_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that w [...]
+    public static final Boolean CAMEL_SINK_ATLASMAP_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_CONF = "camel.sink.endpoint.sourceMapName";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_DOC = "The Exchange property name for a source message map which hold java.util.Map&lt;String, Message&gt; where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source properties where the scope equals to Document ID.";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_CONF = "camel.sink.endpoint.targetMapMode";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_DOC = "TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores them into a java.util.Map, and the java.util.Map is set to an exchange property if 'targetMapName' is specified, otherwise message body. 'MESSAGE_HEADER': Stores them into message headers. 'EXCHANGE_PROPERTY': Stores them into exchange properties. ) One of: [MAP] [MESSAGE_HEADER] [EXCHANGE_PROPERTY]";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_DEFAULT = "MAP";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_CONF = "camel.sink.endpoint.targetMapName";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DOC = "The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map.";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
+    public static final Boolean CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_CONF = "camel.sink.endpoint.propertiesFile";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DOC = "The URI of the properties file which is used for AtlasContextFactory initialization.";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DEFAULT = null;
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
+    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
+    public static final Boolean CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atlasmap.lazyStartProducer";
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that  [...]
+    public static final Boolean CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_CONF = "camel.component.atlasmap.atlasContextFactory";
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DOC = "To use the AtlasContextFactory otherwise a new engine is created.";
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DEFAULT = null;
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atlasmap.basicPropertyBinding";
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
+    public static final Boolean CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+
+    public CamelAtlasmapSinkConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelAtlasmapSinkConnectorConfig(Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
+        conf.define(CAMEL_SINK_ATLASMAP_PATH_RESOURCE_URI_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_PATH_RESOURCE_URI_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_ATLASMAP_PATH_RESOURCE_URI_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_ALLOW_CONTEXT_MAP_ALL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_ALLOW_CONTEXT_MAP_ALL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_ALLOW_CONTEXT_MAP_ALL_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_CONTENT_CACHE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_CONTENT_CACHE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_CONTENT_CACHE_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkTask.java b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkTask.java
new file mode 100644
index 0000000..a729f9d
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkTask.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.atlasmap;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSinkTask;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelAtlasmapSinkTask extends CamelSinkTask {
+
+    @Override
+    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
+            Map<String, String> props) {
+        return new CamelAtlasmapSinkConnectorConfig(props);
+    }
+    @Override
+    protected Map<String, String> getDefaultConfig() {
+        return new HashMap<String, String>() {{
+            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "atlasmap");
+        }};
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-atlasmap-kafka-connector/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-atlasmap-kafka-connector/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json
index 964f356..35164dc 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-sink.json
@@ -81,6 +81,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.useIAMCredentials": {
+			"name": "camel.sink.endpoint.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.delaySeconds": {
 			"name": "camel.sink.endpoint.delaySeconds",
 			"description": "Delay sending messages for a number of seconds.",
@@ -260,6 +267,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.useIAMCredentials": {
+			"name": "camel.component.aws2-sqs.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.delaySeconds": {
 			"name": "camel.component.aws2-sqs.delaySeconds",
 			"description": "Delay sending messages for a number of seconds.",
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json
index c819570..7684b15 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/generated/resources/camel-aws2-sqs-source.json
@@ -81,6 +81,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.useIAMCredentials": {
+			"name": "camel.source.endpoint.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.attributeNames": {
 			"name": "camel.source.endpoint.attributeNames",
 			"description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma.",
@@ -436,6 +443,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-sqs.useIAMCredentials": {
+			"name": "camel.component.aws2-sqs.useIAMCredentials",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-sqs.attributeNames": {
 			"name": "camel.component.aws2-sqs.attributeNames",
 			"description": "A list of attribute names to receive when consuming. Multiple names can be separated by comma.",
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc
index c440385..6ef24fb 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSinkConnecto
 ----
 
 
-The camel-aws2-sqs sink connector supports 56 options, which are listed below.
+The camel-aws2-sqs sink connector supports 58 options, which are listed below.
 
 
 
@@ -40,6 +40,7 @@ The camel-aws2-sqs sink connector supports 56 options, which are listed below.
 | *camel.sink.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.sink.endpoint.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
@@ -68,6 +69,7 @@ The camel-aws2-sqs sink connector supports 56 options, which are listed below.
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sqs.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.component.aws2-sqs.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-sqs.messageDeduplicationId Strategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc
index 88d9b18..8556305 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/docs/camel-aws2-sqs-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSourceConnec
 ----
 
 
-The camel-aws2-sqs source connector supports 91 options, which are listed below.
+The camel-aws2-sqs source connector supports 93 options, which are listed below.
 
 
 
@@ -40,6 +40,7 @@ The camel-aws2-sqs source connector supports 91 options, which are listed below.
 | *camel.source.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.source.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.source.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.source.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.source.endpoint.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
@@ -95,6 +96,7 @@ The camel-aws2-sqs source connector supports 91 options, which are listed below.
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sqs.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.component.aws2-sqs.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.component.aws2-sqs.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java
index d8b55a5..360c59d 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSinkConnectorConfig.java
@@ -57,6 +57,9 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.sink.endpoint.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_CONF = "camel.sink.endpoint.useIAMCredentials";
+    public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_CONF = "camel.sink.endpoint.delaySeconds";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DOC = "Delay sending messages for a number of seconds.";
     public static final String CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DEFAULT = null;
@@ -141,6 +144,9 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-sqs.trustAllCertificates";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_CONF = "camel.component.aws2-sqs.useIAMCredentials";
+    public static final String CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_CONF = "camel.component.aws2-sqs.delaySeconds";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DOC = "Delay sending messages for a number of seconds.";
     public static final String CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DEFAULT = null;
@@ -216,6 +222,7 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_DELAY_SECONDS_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
@@ -244,6 +251,7 @@ public class CamelAws2sqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_DELAY_SECONDS_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2SQS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2SQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2SQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2SQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
diff --git a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java
index 2bee40e..44e5044 100644
--- a/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java
+++ b/connectors/camel-aws2-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2sqs/CamelAws2sqsSourceConnectorConfig.java
@@ -59,6 +59,9 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF = "camel.source.endpoint.trustAllCertificates";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_CONF = "camel.source.endpoint.useIAMCredentials";
+    public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_CONF = "camel.source.endpoint.attributeNames";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DOC = "A list of attribute names to receive when consuming. Multiple names can be separated by comma.";
     public static final String CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DEFAULT = null;
@@ -224,6 +227,9 @@ public class CamelAws2sqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF = "camel.component.aws2-sqs.trustAllCertificates";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC = "If we want to trust all certificates in case of overriding the endpoint";
     public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_CONF = "camel.component.aws2-sqs.useIAMCredentials";
+    public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DOC = "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.";
+    public static final Boolean CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_CONF = "camel.component.aws2-sqs.attributeNames";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DOC = "A list of attribute names to receive when consuming. Multiple names can be separated by comma.";
     public static final String CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DEFAULT = null;
@@ -323,6 +329,7 @@ public class CamelAws2sqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_USE_IAMCREDENTIALS_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_ATTRIBUTE_NAMES_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_ENDPOINT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWS2SQS_ENDPOINT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_ENDPOINT_CONCURRENT_CONSUMERS_DOC);
@@ -378,6 +385,7 @@ public class CamelAws2sqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_QUEUE_OWNER_AWSACCOUNT_ID_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
+        conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_USE_IAMCREDENTIALS_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_ATTRIBUTE_NAMES_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWS2SQS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWS2SQS_COMPONENT_CONCURRENT_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWS2SQS_COMPONENT_CONCURRENT_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWS2SQS_COMPONENT_CONCURRENT_CONSUMERS_DOC);
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-sink.json b/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-sink.json
index fe3b13d..fcf267d 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-sink.json
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-sink.json
@@ -98,6 +98,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.regex": {
+			"name": "camel.sink.endpoint.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.serviceClient": {
 			"name": "camel.sink.endpoint.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
@@ -276,6 +282,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.azure-storage-blob.regex": {
+			"name": "camel.component.azure-storage-blob.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.azure-storage-blob.serviceClient": {
 			"name": "camel.component.azure-storage-blob.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-source.json b/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-source.json
index 92bdb2f..26374df 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-source.json
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/generated/resources/camel-azure-storage-blob-source.json
@@ -98,6 +98,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.regex": {
+			"name": "camel.source.endpoint.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.serviceClient": {
 			"name": "camel.source.endpoint.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
@@ -226,6 +232,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.azure-storage-blob.regex": {
+			"name": "camel.component.azure-storage-blob.regex",
+			"description": "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.azure-storage-blob.serviceClient": {
 			"name": "camel.component.azure-storage-blob.serviceClient",
 			"description": "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob are availa [...]
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-sink-connector.adoc b/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-sink-connector.adoc
index eb964c1..7ccac04 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-sink-connector.adoc
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.azurestorageblob.CamelAzurestora
 ----
 
 
-The camel-azure-storage-blob sink connector supports 55 options, which are listed below.
+The camel-azure-storage-blob sink connector supports 57 options, which are listed below.
 
 
 
@@ -43,6 +43,7 @@ The camel-azure-storage-blob sink connector supports 55 options, which are liste
 | *camel.sink.endpoint.maxResultsPerPage* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.sink.endpoint.maxRetryRequests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.sink.endpoint.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.sink.endpoint.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.sink.endpoint.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations [...]
 | *camel.sink.endpoint.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.sink.endpoint.blobSequenceNumber* | A user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 263 - 1.The default value is 0. | "0" | false | MEDIUM
@@ -70,6 +71,7 @@ The camel-azure-storage-blob sink connector supports 55 options, which are liste
 | *camel.component.azure-storage-blob.maxResultsPer Page* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.maxRetry Requests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.component.azure-storage-blob.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.component.azure-storage-blob.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), [...]
 | *camel.component.azure-storage-blob.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.blobSequence Number* | A user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 263 - 1.The default value is 0. | "0" | false | MEDIUM
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-source-connector.adoc b/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-source-connector.adoc
index 1d42bda..aa2e872 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-source-connector.adoc
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/main/docs/camel-azure-storage-blob-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.azurestorageblob.CamelAzurestora
 ----
 
 
-The camel-azure-storage-blob source connector supports 39 options, which are listed below.
+The camel-azure-storage-blob source connector supports 41 options, which are listed below.
 
 
 
@@ -43,6 +43,7 @@ The camel-azure-storage-blob source connector supports 39 options, which are lis
 | *camel.source.endpoint.maxResultsPerPage* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.source.endpoint.maxRetryRequests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.source.endpoint.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.source.endpoint.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.source.endpoint.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operatio [...]
 | *camel.source.endpoint.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
@@ -63,6 +64,7 @@ The camel-azure-storage-blob source connector supports 39 options, which are lis
 | *camel.component.azure-storage-blob.maxResultsPer Page* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.maxRetry Requests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.component.azure-storage-blob.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.component.azure-storage-blob.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), [...]
 | *camel.component.azure-storage-blob.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.bridgeError Handler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSinkConnectorConfig.java b/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSinkConnectorConfig.java
index 2c16eba..96d5949 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSinkConnectorConfig.java
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSinkConnectorConfig.java
@@ -68,6 +68,9 @@ public class CamelAzurestorageblobSinkConnectorConfig
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_PREFIX_CONF = "camel.sink.endpoint.prefix";
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DOC = "Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs.";
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DEFAULT = null;
+    public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_REGEX_CONF = "camel.sink.endpoint.regex";
+    public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_REGEX_DOC = "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.";
+    public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_REGEX_DEFAULT = null;
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_CONF = "camel.sink.endpoint.serviceClient";
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DOC = "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceCli [...]
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DEFAULT = null;
@@ -149,6 +152,9 @@ public class CamelAzurestorageblobSinkConnectorConfig
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_PREFIX_CONF = "camel.component.azure-storage-blob.prefix";
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_PREFIX_DOC = "Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs.";
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_PREFIX_DEFAULT = null;
+    public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_REGEX_CONF = "camel.component.azure-storage-blob.regex";
+    public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_REGEX_DOC = "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.";
+    public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_REGEX_DEFAULT = null;
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_CONF = "camel.component.azure-storage-blob.serviceClient";
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DOC = "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceCl [...]
     public static final String CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DEFAULT = null;
@@ -219,6 +225,7 @@ public class CamelAzurestorageblobSinkConnectorConfig
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_MAX_RESULTS_PER_PAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_MAX_RESULTS_PER_PAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_MAX_RESULTS_PER_PAGE_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_MAX_RETRY_REQUESTS_CONF, ConfigDef.Type.INT, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_MAX_RETRY_REQUESTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_MAX_RETRY_REQUESTS_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_PREFIX_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DOC);
+        conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_REGEX_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_REGEX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_REGEX_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_TIMEOUT_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_BLOB_SEQUENCE_NUMBER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_BLOB_SEQUENCE_NUMBER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_ENDPOINT_BLOB_SEQUENCE_NUMBER_DOC);
@@ -246,6 +253,7 @@ public class CamelAzurestorageblobSinkConnectorConfig
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_MAX_RESULTS_PER_PAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_MAX_RESULTS_PER_PAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_MAX_RESULTS_PER_PAGE_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_MAX_RETRY_REQUESTS_CONF, ConfigDef.Type.INT, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_MAX_RETRY_REQUESTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_MAX_RETRY_REQUESTS_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_PREFIX_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_PREFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_PREFIX_DOC);
+        conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_REGEX_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_REGEX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_REGEX_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_TIMEOUT_DOC);
         conf.define(CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_BLOB_SEQUENCE_NUMBER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_BLOB_SEQUENCE_NUMBER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AZURESTORAGEBLOB_COMPONENT_BLOB_SEQUENCE_NUMBER_DOC);
diff --git a/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSourceConnectorConfig.java b/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSourceConnectorConfig.java
index dcf272e..d2125f2 100644
--- a/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSourceConnectorConfig.java
+++ b/connectors/camel-azure-storage-blob-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/azurestorageblob/CamelAzurestorageblobSourceConnectorConfig.java
@@ -68,6 +68,9 @@ public class CamelAzurestorageblobSourceConnectorConfig
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_PREFIX_CONF = "camel.source.endpoint.prefix";
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DOC = "Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs.";
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_REGEX_CONF = "camel.source.endpoint.regex";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_REGEX_DOC = "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_REGEX_DEFAULT = null;
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_CONF = "camel.source.endpoint.serviceClient";
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DOC = "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceC [...]
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DEFAULT = null;
@@ -128,6 +131,9 @@ public class CamelAzurestorageblobSourceConnectorConfig
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_PREFIX_CONF = "camel.component.azure-storage-blob.prefix";
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_PREFIX_DOC = "Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs.";
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_PREFIX_DEFAULT = null;
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_REGEX_CONF = "camel.component.azure-storage-blob.regex";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_REGEX_DOC = "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.";
+    public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_REGEX_DEFAULT = null;
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_CONF = "camel.component.azure-storage-blob.serviceClient";
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DOC = "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobService [...]
     public static final String CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DEFAULT = null;
@@ -171,6 +177,7 @@ public class CamelAzurestorageblobSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_MAX_RESULTS_PER_PAGE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_MAX_RESULTS_PER_PAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_MAX_RESULTS_PER_PAGE_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_MAX_RETRY_REQUESTS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_MAX_RETRY_REQUESTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_MAX_RETRY_REQUESTS_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_PREFIX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_PREFIX_DOC);
+        conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_REGEX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_REGEX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_REGEX_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_SERVICE_CLIENT_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_TIMEOUT_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
@@ -191,6 +198,7 @@ public class CamelAzurestorageblobSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_MAX_RESULTS_PER_PAGE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_MAX_RESULTS_PER_PAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_MAX_RESULTS_PER_PAGE_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_MAX_RETRY_REQUESTS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_MAX_RETRY_REQUESTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_MAX_RETRY_REQUESTS_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_PREFIX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_PREFIX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_PREFIX_DOC);
+        conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_REGEX_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_REGEX_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_REGEX_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_SERVICE_CLIENT_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_TIMEOUT_DOC);
         conf.define(CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AZURESTORAGEBLOB_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
diff --git a/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-sink.json b/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-sink.json
index 4fe21c2..0d2f926 100644
--- a/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-sink.json
+++ b/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-sink.json
@@ -31,8 +31,8 @@
 		"camel.sink.endpoint.bucket": {
 			"name": "camel.sink.endpoint.bucket",
 			"description": "The bucket to use",
-			"priority": "MEDIUM",
-			"required": "false"
+			"priority": "HIGH",
+			"required": "true"
 		},
 		"camel.sink.endpoint.collection": {
 			"name": "camel.sink.endpoint.collection",
diff --git a/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-source.json b/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-source.json
index f592523..59fba50 100644
--- a/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-source.json
+++ b/connectors/camel-couchbase-kafka-connector/src/generated/resources/camel-couchbase-source.json
@@ -31,8 +31,8 @@
 		"camel.source.endpoint.bucket": {
 			"name": "camel.source.endpoint.bucket",
 			"description": "The bucket to use",
-			"priority": "MEDIUM",
-			"required": "false"
+			"priority": "HIGH",
+			"required": "true"
 		},
 		"camel.source.endpoint.collection": {
 			"name": "camel.source.endpoint.collection",
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-sink-connector.adoc b/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-sink-connector.adoc
index ae2f60d..25299ae 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-sink-connector.adoc
+++ b/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-sink-connector.adoc
@@ -32,7 +32,7 @@ The camel-couchbase sink connector supports 23 options, which are listed below.
 | *camel.sink.path.protocol* | The protocol to use | null | true | HIGH
 | *camel.sink.path.hostname* | The hostname to use | null | true | HIGH
 | *camel.sink.path.port* | The port number to use | 8091 | false | MEDIUM
-| *camel.sink.endpoint.bucket* | The bucket to use | null | false | MEDIUM
+| *camel.sink.endpoint.bucket* | The bucket to use | null | true | HIGH
 | *camel.sink.endpoint.collection* | The collection to use | null | false | MEDIUM
 | *camel.sink.endpoint.key* | The key to use | null | false | MEDIUM
 | *camel.sink.endpoint.scope* | The scope to use | null | false | MEDIUM
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-source-connector.adoc b/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-source-connector.adoc
index 474abfc..3d6f169 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-source-connector.adoc
+++ b/connectors/camel-couchbase-kafka-connector/src/main/docs/camel-couchbase-kafka-source-connector.adoc
@@ -32,7 +32,7 @@ The camel-couchbase source connector supports 42 options, which are listed below
 | *camel.source.path.protocol* | The protocol to use | null | true | HIGH
 | *camel.source.path.hostname* | The hostname to use | null | true | HIGH
 | *camel.source.path.port* | The port number to use | 8091 | false | MEDIUM
-| *camel.source.endpoint.bucket* | The bucket to use | null | false | MEDIUM
+| *camel.source.endpoint.bucket* | The bucket to use | null | true | HIGH
 | *camel.source.endpoint.collection* | The collection to use | null | false | MEDIUM
 | *camel.source.endpoint.key* | The key to use | null | false | MEDIUM
 | *camel.source.endpoint.scope* | The scope to use | null | false | MEDIUM
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties b/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
index fdebdc2..3bd291f 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
+++ b/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
@@ -28,6 +28,8 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
+# The bucket to use
+camel.sink.endpoint.bucket=
 # The hostname to use
 camel.sink.path.hostname=
 # The protocol to use
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties b/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties
index 142739b..3b55af7 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties
+++ b/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties
@@ -28,6 +28,8 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
+# The bucket to use
+camel.source.endpoint.bucket=
 # The hostname to use
 camel.source.path.hostname=
 # The protocol to use
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSinkConnectorConfig.java b/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSinkConnectorConfig.java
index 3e62553..b3e77c2 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSinkConnectorConfig.java
+++ b/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSinkConnectorConfig.java
@@ -111,7 +111,7 @@ public class CamelCouchbaseSinkConnectorConfig
         conf.define(CAMEL_SINK_COUCHBASE_PATH_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_PATH_PROTOCOL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_COUCHBASE_PATH_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_COUCHBASE_PATH_HOSTNAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_PATH_HOSTNAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_COUCHBASE_PATH_HOSTNAME_DOC);
         conf.define(CAMEL_SINK_COUCHBASE_PATH_PORT_CONF, ConfigDef.Type.INT, CAMEL_SINK_COUCHBASE_PATH_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_COUCHBASE_PATH_PORT_DOC);
-        conf.define(CAMEL_SINK_COUCHBASE_ENDPOINT_BUCKET_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_ENDPOINT_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_COUCHBASE_ENDPOINT_BUCKET_DOC);
+        conf.define(CAMEL_SINK_COUCHBASE_ENDPOINT_BUCKET_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_ENDPOINT_BUCKET_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_COUCHBASE_ENDPOINT_BUCKET_DOC);
         conf.define(CAMEL_SINK_COUCHBASE_ENDPOINT_COLLECTION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_ENDPOINT_COLLECTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_COUCHBASE_ENDPOINT_COLLECTION_DOC);
         conf.define(CAMEL_SINK_COUCHBASE_ENDPOINT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_ENDPOINT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_COUCHBASE_ENDPOINT_KEY_DOC);
         conf.define(CAMEL_SINK_COUCHBASE_ENDPOINT_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_COUCHBASE_ENDPOINT_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_COUCHBASE_ENDPOINT_SCOPE_DOC);
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSourceConnectorConfig.java b/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSourceConnectorConfig.java
index 140003e..6ea88ab 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSourceConnectorConfig.java
+++ b/connectors/camel-couchbase-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/couchbase/CamelCouchbaseSourceConnectorConfig.java
@@ -168,7 +168,7 @@ public class CamelCouchbaseSourceConnectorConfig
         conf.define(CAMEL_SOURCE_COUCHBASE_PATH_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_PATH_PROTOCOL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_COUCHBASE_PATH_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_COUCHBASE_PATH_HOSTNAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_PATH_HOSTNAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_COUCHBASE_PATH_HOSTNAME_DOC);
         conf.define(CAMEL_SOURCE_COUCHBASE_PATH_PORT_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_COUCHBASE_PATH_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_COUCHBASE_PATH_PORT_DOC);
-        conf.define(CAMEL_SOURCE_COUCHBASE_ENDPOINT_BUCKET_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_ENDPOINT_BUCKET_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_COUCHBASE_ENDPOINT_BUCKET_DOC);
+        conf.define(CAMEL_SOURCE_COUCHBASE_ENDPOINT_BUCKET_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_ENDPOINT_BUCKET_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_COUCHBASE_ENDPOINT_BUCKET_DOC);
         conf.define(CAMEL_SOURCE_COUCHBASE_ENDPOINT_COLLECTION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_ENDPOINT_COLLECTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_COUCHBASE_ENDPOINT_COLLECTION_DOC);
         conf.define(CAMEL_SOURCE_COUCHBASE_ENDPOINT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_ENDPOINT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_COUCHBASE_ENDPOINT_KEY_DOC);
         conf.define(CAMEL_SOURCE_COUCHBASE_ENDPOINT_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_COUCHBASE_ENDPOINT_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_COUCHBASE_ENDPOINT_SCOPE_DOC);
diff --git a/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-sink.json b/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-sink.json
index 6fd403c..bea3a4b 100644
--- a/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-sink.json
+++ b/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-sink.json
@@ -21,6 +21,26 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.allowEmpty": {
+			"name": "camel.sink.endpoint.allowEmpty",
+			"description": "The flag to manage empty git commits",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.lazyStartProducer": {
+			"name": "camel.sink.endpoint.lazyStartProducer",
+			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.operation": {
+			"name": "camel.sink.endpoint.operation",
+			"description": "The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList]",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.password": {
 			"name": "camel.sink.endpoint.password",
 			"description": "Remote repository password",
@@ -51,26 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.allowEmpty": {
-			"name": "camel.sink.endpoint.allowEmpty",
-			"description": "The flag to manage empty git commits",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.lazyStartProducer": {
-			"name": "camel.sink.endpoint.lazyStartProducer",
-			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.operation": {
-			"name": "camel.sink.endpoint.operation",
-			"description": "The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList]",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.basicPropertyBinding": {
 			"name": "camel.sink.endpoint.basicPropertyBinding",
 			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
diff --git a/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-source.json b/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-source.json
index 6324c50..a7f7dcd 100644
--- a/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-source.json
+++ b/connectors/camel-git-kafka-connector/src/generated/resources/camel-git-source.json
@@ -21,36 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.password": {
-			"name": "camel.source.endpoint.password",
-			"description": "Remote repository password",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.remoteName": {
-			"name": "camel.source.endpoint.remoteName",
-			"description": "The remote repository name to use in particular operation like pull",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.remotePath": {
-			"name": "camel.source.endpoint.remotePath",
-			"description": "The remote repository path",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.tagName": {
-			"name": "camel.source.endpoint.tagName",
-			"description": "The tag name to work on",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.source.endpoint.username": {
-			"name": "camel.source.endpoint.username",
-			"description": "Remote repository username",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bridgeErrorHandler": {
 			"name": "camel.source.endpoint.bridgeErrorHandler",
 			"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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-sink-connector.adoc b/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-sink-connector.adoc
index 11b02be..ba7d35c 100644
--- a/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-sink-connector.adoc
+++ b/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-sink-connector.adoc
@@ -31,14 +31,14 @@ The camel-git sink connector supports 14 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.localPath* | Local repository path | null | true | HIGH
 | *camel.sink.endpoint.branchName* | The branch name to work on | null | false | MEDIUM
+| *camel.sink.endpoint.allowEmpty* | The flag to manage empty git commits | true | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
+| *camel.sink.endpoint.operation* | The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList] | null | false | MEDIUM
 | *camel.sink.endpoint.password* | Remote repository password | null | false | MEDIUM
 | *camel.sink.endpoint.remoteName* | The remote repository name to use in particular operation like pull | null | false | MEDIUM
 | *camel.sink.endpoint.remotePath* | The remote repository path | null | false | MEDIUM
 | *camel.sink.endpoint.tagName* | The tag name to work on | null | false | MEDIUM
 | *camel.sink.endpoint.username* | Remote repository username | null | false | MEDIUM
-| *camel.sink.endpoint.allowEmpty* | The flag to manage empty git commits | true | false | MEDIUM
-| *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.operation* | The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList] | null | false | MEDIUM
 | *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.git.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
diff --git a/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-source-connector.adoc b/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-source-connector.adoc
index 8d96def..f3f93a9 100644
--- a/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-source-connector.adoc
+++ b/connectors/camel-git-kafka-connector/src/main/docs/camel-git-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.git.CamelGitSourceConnector
 ----
 
 
-The camel-git source connector supports 15 options, which are listed below.
+The camel-git source connector supports 10 options, which are listed below.
 
 
 
@@ -31,11 +31,6 @@ The camel-git source connector supports 15 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.source.path.localPath* | Local repository path | null | true | HIGH
 | *camel.source.endpoint.branchName* | The branch name to work on | null | false | MEDIUM
-| *camel.source.endpoint.password* | Remote repository password | null | false | MEDIUM
-| *camel.source.endpoint.remoteName* | The remote repository name to use in particular operation like pull | null | false | MEDIUM
-| *camel.source.endpoint.remotePath* | The remote repository path | null | false | MEDIUM
-| *camel.source.endpoint.tagName* | The tag name to work on | null | false | MEDIUM
-| *camel.source.endpoint.username* | Remote repository username | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.type* | The consumer type One of: [commit] [tag] [branch] | null | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
diff --git a/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSinkConnectorConfig.java b/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSinkConnectorConfig.java
index d9012e4..55b513f 100644
--- a/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSinkConnectorConfig.java
+++ b/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSinkConnectorConfig.java
@@ -30,6 +30,15 @@ public class CamelGitSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_GIT_ENDPOINT_BRANCH_NAME_CONF = "camel.sink.endpoint.branchName";
     public static final String CAMEL_SINK_GIT_ENDPOINT_BRANCH_NAME_DOC = "The branch name to work on";
     public static final String CAMEL_SINK_GIT_ENDPOINT_BRANCH_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_CONF = "camel.sink.endpoint.allowEmpty";
+    public static final String CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DOC = "The flag to manage empty git commits";
+    public static final Boolean CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DEFAULT = true;
+    public static final String CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
+    public static final String CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when t [...]
+    public static final Boolean CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_GIT_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
+    public static final String CAMEL_SINK_GIT_ENDPOINT_OPERATION_DOC = "The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList]";
+    public static final String CAMEL_SINK_GIT_ENDPOINT_OPERATION_DEFAULT = null;
     public static final String CAMEL_SINK_GIT_ENDPOINT_PASSWORD_CONF = "camel.sink.endpoint.password";
     public static final String CAMEL_SINK_GIT_ENDPOINT_PASSWORD_DOC = "Remote repository password";
     public static final String CAMEL_SINK_GIT_ENDPOINT_PASSWORD_DEFAULT = null;
@@ -45,15 +54,6 @@ public class CamelGitSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_GIT_ENDPOINT_USERNAME_CONF = "camel.sink.endpoint.username";
     public static final String CAMEL_SINK_GIT_ENDPOINT_USERNAME_DOC = "Remote repository username";
     public static final String CAMEL_SINK_GIT_ENDPOINT_USERNAME_DEFAULT = null;
-    public static final String CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_CONF = "camel.sink.endpoint.allowEmpty";
-    public static final String CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DOC = "The flag to manage empty git commits";
-    public static final Boolean CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DEFAULT = true;
-    public static final String CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
-    public static final String CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when t [...]
-    public static final Boolean CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_GIT_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
-    public static final String CAMEL_SINK_GIT_ENDPOINT_OPERATION_DOC = "The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList]";
-    public static final String CAMEL_SINK_GIT_ENDPOINT_OPERATION_DEFAULT = null;
     public static final String CAMEL_SINK_GIT_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
     public static final String CAMEL_SINK_GIT_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
     public static final Boolean CAMEL_SINK_GIT_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
@@ -81,14 +81,14 @@ public class CamelGitSinkConnectorConfig extends CamelSinkConnectorConfig {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_GIT_PATH_LOCAL_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_PATH_LOCAL_PATH_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GIT_PATH_LOCAL_PATH_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_BRANCH_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_BRANCH_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_BRANCH_NAME_DOC);
+        conf.define(CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DOC);
+        conf.define(CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_GIT_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_OPERATION_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_PASSWORD_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_REMOTE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_REMOTE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_REMOTE_NAME_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_REMOTE_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_REMOTE_PATH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_REMOTE_PATH_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_TAG_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_TAG_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_TAG_NAME_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_USERNAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_USERNAME_DOC);
-        conf.define(CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_ALLOW_EMPTY_DOC);
-        conf.define(CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_GIT_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GIT_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_OPERATION_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_GIT_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_GIT_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GIT_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GIT_COMPONENT_LAZY_START_PRODUCER_DOC);
diff --git a/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSourceConnectorConfig.java b/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSourceConnectorConfig.java
index d9b975d..9bddcef 100644
--- a/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSourceConnectorConfig.java
+++ b/connectors/camel-git-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/git/CamelGitSourceConnectorConfig.java
@@ -30,21 +30,6 @@ public class CamelGitSourceConnectorConfig extends CamelSourceConnectorConfig {
     public static final String CAMEL_SOURCE_GIT_ENDPOINT_BRANCH_NAME_CONF = "camel.source.endpoint.branchName";
     public static final String CAMEL_SOURCE_GIT_ENDPOINT_BRANCH_NAME_DOC = "The branch name to work on";
     public static final String CAMEL_SOURCE_GIT_ENDPOINT_BRANCH_NAME_DEFAULT = null;
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_PASSWORD_CONF = "camel.source.endpoint.password";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_PASSWORD_DOC = "Remote repository password";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_PASSWORD_DEFAULT = null;
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_NAME_CONF = "camel.source.endpoint.remoteName";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_NAME_DOC = "The remote repository name to use in particular operation like pull";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_NAME_DEFAULT = null;
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_PATH_CONF = "camel.source.endpoint.remotePath";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_PATH_DOC = "The remote repository path";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_PATH_DEFAULT = null;
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_TAG_NAME_CONF = "camel.source.endpoint.tagName";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_TAG_NAME_DOC = "The tag name to work on";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_TAG_NAME_DEFAULT = null;
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_USERNAME_CONF = "camel.source.endpoint.username";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_USERNAME_DOC = "Remote repository username";
-    public static final String CAMEL_SOURCE_GIT_ENDPOINT_USERNAME_DEFAULT = null;
     public static final String CAMEL_SOURCE_GIT_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_GIT_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_GIT_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
@@ -84,11 +69,6 @@ public class CamelGitSourceConnectorConfig extends CamelSourceConnectorConfig {
         ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
         conf.define(CAMEL_SOURCE_GIT_PATH_LOCAL_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_PATH_LOCAL_PATH_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_GIT_PATH_LOCAL_PATH_DOC);
         conf.define(CAMEL_SOURCE_GIT_ENDPOINT_BRANCH_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_BRANCH_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_BRANCH_NAME_DOC);
-        conf.define(CAMEL_SOURCE_GIT_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_PASSWORD_DOC);
-        conf.define(CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_NAME_DOC);
-        conf.define(CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_PATH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_REMOTE_PATH_DOC);
-        conf.define(CAMEL_SOURCE_GIT_ENDPOINT_TAG_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_TAG_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_TAG_NAME_DOC);
-        conf.define(CAMEL_SOURCE_GIT_ENDPOINT_USERNAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_USERNAME_DOC);
         conf.define(CAMEL_SOURCE_GIT_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GIT_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_GIT_ENDPOINT_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_TYPE_DOC);
         conf.define(CAMEL_SOURCE_GIT_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GIT_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GIT_ENDPOINT_EXCEPTION_HANDLER_DOC);
diff --git a/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-sink.json b/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-sink.json
index 48dea76..fac545a 100644
--- a/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-sink.json
+++ b/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-sink.json
@@ -27,6 +27,13 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.sink.endpoint.autoDiscoverClientInterceptors": {
+			"name": "camel.sink.endpoint.autoDiscoverClientInterceptors",
+			"description": "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.flowControlWindow": {
 			"name": "camel.sink.endpoint.flowControlWindow",
 			"description": "The HTTP\/2 flow control window size (MiB)",
diff --git a/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-source.json b/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-source.json
index cbe6e50..7233809 100644
--- a/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-source.json
+++ b/connectors/camel-grpc-kafka-connector/src/generated/resources/camel-grpc-source.json
@@ -27,6 +27,13 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
+		"camel.source.endpoint.autoDiscoverClientInterceptors": {
+			"name": "camel.source.endpoint.autoDiscoverClientInterceptors",
+			"description": "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.flowControlWindow": {
 			"name": "camel.source.endpoint.flowControlWindow",
 			"description": "The HTTP\/2 flow control window size (MiB)",
@@ -76,6 +83,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.routeControlledStreamObserver": {
+			"name": "camel.source.endpoint.routeControlledStreamObserver",
+			"description": "Lets the route to take control over stream observer. If this value is set to true, then the response observer of gRPC call will be set with the name GrpcConstants.GRPC_RESPONSE_OBSERVER in the Exchange object. Please note that the stream observer's onNext(), onError(), onCompleted() methods should be called in the route.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.exceptionHandler": {
 			"name": "camel.source.endpoint.exceptionHandler",
 			"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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
diff --git a/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-sink-connector.adoc b/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-sink-connector.adoc
index 71c1ddf..60d52b1 100644
--- a/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-sink-connector.adoc
+++ b/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.grpc.CamelGrpcSinkConnector
 ----
 
 
-The camel-grpc sink connector supports 25 options, which are listed below.
+The camel-grpc sink connector supports 26 options, which are listed below.
 
 
 
@@ -32,6 +32,7 @@ The camel-grpc sink connector supports 25 options, which are listed below.
 | *camel.sink.path.host* | The gRPC server host name. This is localhost or 0.0.0.0 when being a consumer or remote server host name when using producer. | null | true | HIGH
 | *camel.sink.path.port* | The gRPC local or remote server port | null | true | HIGH
 | *camel.sink.path.service* | Fully qualified service name from the protocol buffer descriptor file (package dot service definition name) | null | true | HIGH
+| *camel.sink.endpoint.autoDiscoverClientInterceptors* | Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.sink.endpoint.flowControlWindow* | The HTTP/2 flow control window size (MiB) | 1048576 | false | MEDIUM
 | *camel.sink.endpoint.maxMessageSize* | The maximum message size allowed to be received/sent (MiB) | 4194304 | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
diff --git a/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-source-connector.adoc b/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-source-connector.adoc
index 773f507..2e3b58b 100644
--- a/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-source-connector.adoc
+++ b/connectors/camel-grpc-kafka-connector/src/main/docs/camel-grpc-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.grpc.CamelGrpcSourceConnector
 ----
 
 
-The camel-grpc source connector supports 27 options, which are listed below.
+The camel-grpc source connector supports 29 options, which are listed below.
 
 
 
@@ -32,6 +32,7 @@ The camel-grpc source connector supports 27 options, which are listed below.
 | *camel.source.path.host* | The gRPC server host name. This is localhost or 0.0.0.0 when being a consumer or remote server host name when using producer. | null | true | HIGH
 | *camel.source.path.port* | The gRPC local or remote server port | null | true | HIGH
 | *camel.source.path.service* | Fully qualified service name from the protocol buffer descriptor file (package dot service definition name) | null | true | HIGH
+| *camel.source.endpoint.autoDiscoverClient Interceptors* | Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.source.endpoint.flowControlWindow* | The HTTP/2 flow control window size (MiB) | 1048576 | false | MEDIUM
 | *camel.source.endpoint.maxMessageSize* | The maximum message size allowed to be received/sent (MiB) | 4194304 | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
@@ -39,6 +40,7 @@ The camel-grpc source connector supports 27 options, which are listed below.
 | *camel.source.endpoint.forwardOnCompleted* | Determines if onCompleted events should be pushed to the Camel route. | false | false | MEDIUM
 | *camel.source.endpoint.forwardOnError* | Determines if onError events should be pushed to the Camel route. Exceptions will be set as message body. | false | false | MEDIUM
 | *camel.source.endpoint.maxConcurrentCallsPer Connection* | The maximum number of concurrent calls permitted for each incoming server connection | 2147483647 | false | MEDIUM
+| *camel.source.endpoint.routeControlledStream Observer* | Lets the route to take control over stream observer. If this value is set to true, then the response observer of gRPC call will be set with the name GrpcConstants.GRPC_RESPONSE_OBSERVER in the Exchange object. Please note that the stream observer's onNext(), onError(), onCompleted() methods should be called in the route. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
diff --git a/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSinkConnectorConfig.java b/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSinkConnectorConfig.java
index 8ba9f67..c620088 100644
--- a/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSinkConnectorConfig.java
+++ b/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSinkConnectorConfig.java
@@ -33,6 +33,9 @@ public class CamelGrpcSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_GRPC_PATH_SERVICE_CONF = "camel.sink.path.service";
     public static final String CAMEL_SINK_GRPC_PATH_SERVICE_DOC = "Fully qualified service name from the protocol buffer descriptor file (package dot service definition name)";
     public static final String CAMEL_SINK_GRPC_PATH_SERVICE_DEFAULT = null;
+    public static final String CAMEL_SINK_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_CONF = "camel.sink.endpoint.autoDiscoverClientInterceptors";
+    public static final String CAMEL_SINK_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DOC = "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.";
+    public static final Boolean CAMEL_SINK_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DEFAULT = true;
     public static final String CAMEL_SINK_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_CONF = "camel.sink.endpoint.flowControlWindow";
     public static final String CAMEL_SINK_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DOC = "The HTTP/2 flow control window size (MiB)";
     public static final Integer CAMEL_SINK_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DEFAULT = 1048576;
@@ -115,6 +118,7 @@ public class CamelGrpcSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_GRPC_PATH_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GRPC_PATH_HOST_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GRPC_PATH_HOST_DOC);
         conf.define(CAMEL_SINK_GRPC_PATH_PORT_CONF, ConfigDef.Type.INT, CAMEL_SINK_GRPC_PATH_PORT_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GRPC_PATH_PORT_DOC);
         conf.define(CAMEL_SINK_GRPC_PATH_SERVICE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_GRPC_PATH_SERVICE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_GRPC_PATH_SERVICE_DOC);
+        conf.define(CAMEL_SINK_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DOC);
         conf.define(CAMEL_SINK_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_CONF, ConfigDef.Type.INT, CAMEL_SINK_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DOC);
         conf.define(CAMEL_SINK_GRPC_ENDPOINT_MAX_MESSAGE_SIZE_CONF, ConfigDef.Type.INT, CAMEL_SINK_GRPC_ENDPOINT_MAX_MESSAGE_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRPC_ENDPOINT_MAX_MESSAGE_SIZE_DOC);
         conf.define(CAMEL_SINK_GRPC_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_GRPC_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_GRPC_ENDPOINT_LAZY_START_PRODUCER_DOC);
diff --git a/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSourceConnectorConfig.java b/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSourceConnectorConfig.java
index 70672c0..8e29395 100644
--- a/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSourceConnectorConfig.java
+++ b/connectors/camel-grpc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/grpc/CamelGrpcSourceConnectorConfig.java
@@ -35,6 +35,9 @@ public class CamelGrpcSourceConnectorConfig
     public static final String CAMEL_SOURCE_GRPC_PATH_SERVICE_CONF = "camel.source.path.service";
     public static final String CAMEL_SOURCE_GRPC_PATH_SERVICE_DOC = "Fully qualified service name from the protocol buffer descriptor file (package dot service definition name)";
     public static final String CAMEL_SOURCE_GRPC_PATH_SERVICE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_CONF = "camel.source.endpoint.autoDiscoverClientInterceptors";
+    public static final String CAMEL_SOURCE_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DOC = "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.";
+    public static final Boolean CAMEL_SOURCE_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DEFAULT = true;
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_CONF = "camel.source.endpoint.flowControlWindow";
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DOC = "The HTTP/2 flow control window size (MiB)";
     public static final Integer CAMEL_SOURCE_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DEFAULT = 1048576;
@@ -56,6 +59,9 @@ public class CamelGrpcSourceConnectorConfig
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_MAX_CONCURRENT_CALLS_PER_CONNECTION_CONF = "camel.source.endpoint.maxConcurrentCallsPerConnection";
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_MAX_CONCURRENT_CALLS_PER_CONNECTION_DOC = "The maximum number of concurrent calls permitted for each incoming server connection";
     public static final Integer CAMEL_SOURCE_GRPC_ENDPOINT_MAX_CONCURRENT_CALLS_PER_CONNECTION_DEFAULT = 2147483647;
+    public static final String CAMEL_SOURCE_GRPC_ENDPOINT_ROUTE_CONTROLLED_STREAM_OBSERVER_CONF = "camel.source.endpoint.routeControlledStreamObserver";
+    public static final String CAMEL_SOURCE_GRPC_ENDPOINT_ROUTE_CONTROLLED_STREAM_OBSERVER_DOC = "Lets the route to take control over stream observer. If this value is set to true, then the response observer of gRPC call will be set with the name GrpcConstants.GRPC_RESPONSE_OBSERVER in the Exchange object. Please note that the stream observer's onNext(), onError(), onCompleted() methods should be called in the route.";
+    public static final Boolean CAMEL_SOURCE_GRPC_ENDPOINT_ROUTE_CONTROLLED_STREAM_OBSERVER_DEFAULT = false;
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_EXCEPTION_HANDLER_CONF = "camel.source.endpoint.exceptionHandler";
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_EXCEPTION_HANDLER_DOC = "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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final String CAMEL_SOURCE_GRPC_ENDPOINT_EXCEPTION_HANDLER_DEFAULT = null;
@@ -123,6 +129,7 @@ public class CamelGrpcSourceConnectorConfig
         conf.define(CAMEL_SOURCE_GRPC_PATH_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GRPC_PATH_HOST_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_GRPC_PATH_HOST_DOC);
         conf.define(CAMEL_SOURCE_GRPC_PATH_PORT_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_GRPC_PATH_PORT_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_GRPC_PATH_PORT_DOC);
         conf.define(CAMEL_SOURCE_GRPC_PATH_SERVICE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GRPC_PATH_SERVICE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_GRPC_PATH_SERVICE_DOC);
+        conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_AUTO_DISCOVER_CLIENT_INTERCEPTORS_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_FLOW_CONTROL_WINDOW_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_MAX_MESSAGE_SIZE_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_GRPC_ENDPOINT_MAX_MESSAGE_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_MAX_MESSAGE_SIZE_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GRPC_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
@@ -130,6 +137,7 @@ public class CamelGrpcSourceConnectorConfig
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_FORWARD_ON_COMPLETED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GRPC_ENDPOINT_FORWARD_ON_COMPLETED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_FORWARD_ON_COMPLETED_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_FORWARD_ON_ERROR_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GRPC_ENDPOINT_FORWARD_ON_ERROR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_FORWARD_ON_ERROR_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_MAX_CONCURRENT_CALLS_PER_CONNECTION_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_GRPC_ENDPOINT_MAX_CONCURRENT_CALLS_PER_CONNECTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_MAX_CONCURRENT_CALLS_PER_CONNECTION_DOC);
+        conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_ROUTE_CONTROLLED_STREAM_OBSERVER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GRPC_ENDPOINT_ROUTE_CONTROLLED_STREAM_OBSERVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_ROUTE_CONTROLLED_STREAM_OBSERVER_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GRPC_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_GRPC_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_GRPC_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_GRPC_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_GRPC_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
diff --git a/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-sink.json b/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-sink.json
index e1ab101..d5b3d67 100644
--- a/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-sink.json
+++ b/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-sink.json
@@ -81,8 +81,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.kafkaHeaderSerializer": {
-			"name": "camel.sink.endpoint.kafkaHeaderSerializer",
+		"camel.sink.endpoint.headerSerializer": {
+			"name": "camel.sink.endpoint.headerSerializer",
 			"description": "To use a custom KafkaHeaderSerializer to serialize kafka headers values",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -93,8 +93,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.keySerializerClass": {
-			"name": "camel.sink.endpoint.keySerializerClass",
+		"camel.sink.endpoint.keySerializer": {
+			"name": "camel.sink.endpoint.keySerializer",
 			"description": "The serializer class for keys (defaults to the same as for messages if nothing is given).",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
@@ -245,8 +245,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.serializerClass": {
-			"name": "camel.sink.endpoint.serializerClass",
+		"camel.sink.endpoint.valueSerializer": {
+			"name": "camel.sink.endpoint.valueSerializer",
 			"description": "The serializer class for messages.",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
@@ -526,8 +526,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.kafkaHeaderSerializer": {
-			"name": "camel.component.kafka.kafkaHeaderSerializer",
+		"camel.component.kafka.headerSerializer": {
+			"name": "camel.component.kafka.headerSerializer",
 			"description": "To use a custom KafkaHeaderSerializer to serialize kafka headers values",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -538,8 +538,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.keySerializerClass": {
-			"name": "camel.component.kafka.keySerializerClass",
+		"camel.component.kafka.keySerializer": {
+			"name": "camel.component.kafka.keySerializer",
 			"description": "The serializer class for keys (defaults to the same as for messages if nothing is given).",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
@@ -690,8 +690,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.serializerClass": {
-			"name": "camel.component.kafka.serializerClass",
+		"camel.component.kafka.valueSerializer": {
+			"name": "camel.component.kafka.valueSerializer",
 			"description": "The serializer class for messages.",
 			"defaultValue": "\"org.apache.kafka.common.serialization.StringSerializer\"",
 			"priority": "MEDIUM",
diff --git a/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-source.json b/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-source.json
index bdf0daa..d2d7b87 100644
--- a/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-source.json
+++ b/connectors/camel-kafka-kafka-connector/src/generated/resources/camel-kafka-source.json
@@ -157,6 +157,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.headerDeserializer": {
+			"name": "camel.source.endpoint.headerDeserializer",
+			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.heartbeatIntervalMs": {
 			"name": "camel.source.endpoint.heartbeatIntervalMs",
 			"description": "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1\/3 of that value. It can be adjusted even lower to control the expected time for normal rebalances.",
@@ -164,12 +170,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.kafkaHeaderDeserializer": {
-			"name": "camel.source.endpoint.kafkaHeaderDeserializer",
-			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.keyDeserializer": {
 			"name": "camel.source.endpoint.keyDeserializer",
 			"description": "Deserializer class for key that implements the Deserializer interface.",
@@ -563,6 +563,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.kafka.headerDeserializer": {
+			"name": "camel.component.kafka.headerDeserializer",
+			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.kafka.heartbeatIntervalMs": {
 			"name": "camel.component.kafka.heartbeatIntervalMs",
 			"description": "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1\/3 of that value. It can be adjusted even lower to control the expected time for normal rebalances.",
@@ -570,12 +576,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.kafkaHeaderDeserializer": {
-			"name": "camel.component.kafka.kafkaHeaderDeserializer",
-			"description": "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.kafka.keyDeserializer": {
 			"name": "camel.component.kafka.keyDeserializer",
 			"description": "Deserializer class for key that implements the Deserializer interface.",
diff --git a/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-sink-connector.adoc b/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-sink-connector.adoc
index b82f46e..375d202 100644
--- a/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-sink-connector.adoc
+++ b/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-sink-connector.adoc
@@ -40,9 +40,9 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.sink.endpoint.compressionCodec* | This parameter allows you to specify the compression codec for all data generated by this producer. Valid values are none, gzip and snappy. One of: [none] [gzip] [snappy] [lz4] | "none" | false | MEDIUM
 | *camel.sink.endpoint.connectionMaxIdleMs* | Close idle connections after the number of milliseconds specified by this config. | "540000" | false | MEDIUM
 | *camel.sink.endpoint.enableIdempotence* | If set to 'true' the producer will ensure that exactly one copy of each message is written in the stream. If 'false', producer retries may write duplicates of the retried message in the stream. If set to true this option will require max.in.flight.requests.per.connection to be set to 1 and retries cannot be zero and additionally acks must be set to 'all'. | false | false | MEDIUM
-| *camel.sink.endpoint.kafkaHeaderSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
+| *camel.sink.endpoint.headerSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
 | *camel.sink.endpoint.key* | The record key (or null if no key is specified). If this option has been configured then it take precedence over header KafkaConstants#KEY | null | false | MEDIUM
-| *camel.sink.endpoint.keySerializerClass* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.sink.endpoint.keySerializer* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.lingerMs* | The producer groups together any records that arrive in between request transmissions into a single batched request. Normally this occurs only under load when records arrive faster than they can be sent out. However in some circumstances the client may want to reduce the number of requests even under moderate load. This setting accomplishes this by adding a small amount of artificial delay that is, rather than immediately sending out a record the produc [...]
 | *camel.sink.endpoint.maxBlockMs* | The configuration controls how long sending to kafka will block. These methods can be blocked for multiple reasons. For e.g: buffer full, metadata unavailable.This configuration imposes maximum limit on the total time spent in fetching metadata, serialization of key and value, partitioning and allocation of buffer memory when doing a send(). In case of partitionsFor(), this configuration imposes a maximum time threshold on waiting for metadata | "6000 [...]
@@ -64,7 +64,7 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.sink.endpoint.retries* | Setting a value greater than zero will cause the client to resend any record whose send fails with a potentially transient error. Note that this retry is no different than if the client resent the record upon receiving the error. Allowing retries will potentially change the ordering of records because if two records are sent to a single partition, and the first fails and is retried but the second succeeds, then the second record may appear first. | "0" | [...]
 | *camel.sink.endpoint.retryBackoffMs* | Before each retry, the producer refreshes the metadata of relevant topics to see if a new leader has been elected. Since leader election takes a bit of time, this property specifies the amount of time that the producer waits before refreshing the metadata. | "100" | false | MEDIUM
 | *camel.sink.endpoint.sendBufferBytes* | Socket write buffer size | "131072" | false | MEDIUM
-| *camel.sink.endpoint.serializerClass* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.sink.endpoint.valueSerializer* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.sink.endpoint.workerPool* | To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed. | null | false | MEDIUM
 | *camel.sink.endpoint.workerPoolCoreSize* | Number of core threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "10" | false | MEDIUM
 | *camel.sink.endpoint.workerPoolMaxSize* | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "20" | false | MEDIUM
@@ -107,9 +107,9 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.component.kafka.compressionCodec* | This parameter allows you to specify the compression codec for all data generated by this producer. Valid values are none, gzip and snappy. One of: [none] [gzip] [snappy] [lz4] | "none" | false | MEDIUM
 | *camel.component.kafka.connectionMaxIdleMs* | Close idle connections after the number of milliseconds specified by this config. | "540000" | false | MEDIUM
 | *camel.component.kafka.enableIdempotence* | If set to 'true' the producer will ensure that exactly one copy of each message is written in the stream. If 'false', producer retries may write duplicates of the retried message in the stream. If set to true this option will require max.in.flight.requests.per.connection to be set to 1 and retries cannot be zero and additionally acks must be set to 'all'. | false | false | MEDIUM
-| *camel.component.kafka.kafkaHeaderSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
+| *camel.component.kafka.headerSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
 | *camel.component.kafka.key* | The record key (or null if no key is specified). If this option has been configured then it take precedence over header KafkaConstants#KEY | null | false | MEDIUM
-| *camel.component.kafka.keySerializerClass* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.component.kafka.keySerializer* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.component.kafka.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then c [...]
 | *camel.component.kafka.lingerMs* | The producer groups together any records that arrive in between request transmissions into a single batched request. Normally this occurs only under load when records arrive faster than they can be sent out. However in some circumstances the client may want to reduce the number of requests even under moderate load. This setting accomplishes this by adding a small amount of artificial delay that is, rather than immediately sending out a record the prod [...]
 | *camel.component.kafka.maxBlockMs* | The configuration controls how long sending to kafka will block. These methods can be blocked for multiple reasons. For e.g: buffer full, metadata unavailable.This configuration imposes maximum limit on the total time spent in fetching metadata, serialization of key and value, partitioning and allocation of buffer memory when doing a send(). In case of partitionsFor(), this configuration imposes a maximum time threshold on waiting for metadata | "60 [...]
@@ -131,7 +131,7 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.component.kafka.retries* | Setting a value greater than zero will cause the client to resend any record whose send fails with a potentially transient error. Note that this retry is no different than if the client resent the record upon receiving the error. Allowing retries will potentially change the ordering of records because if two records are sent to a single partition, and the first fails and is retried but the second succeeds, then the second record may appear first. | "0" [...]
 | *camel.component.kafka.retryBackoffMs* | Before each retry, the producer refreshes the metadata of relevant topics to see if a new leader has been elected. Since leader election takes a bit of time, this property specifies the amount of time that the producer waits before refreshing the metadata. | "100" | false | MEDIUM
 | *camel.component.kafka.sendBufferBytes* | Socket write buffer size | "131072" | false | MEDIUM
-| *camel.component.kafka.serializerClass* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.component.kafka.valueSerializer* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.component.kafka.workerPool* | To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed. | null | false | MEDIUM
 | *camel.component.kafka.workerPoolCoreSize* | Number of core threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "10" | false | MEDIUM
 | *camel.component.kafka.workerPoolMaxSize* | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "20" | false | MEDIUM
diff --git a/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-source-connector.adoc b/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-source-connector.adoc
index 41f8248..d0d3a71 100644
--- a/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-source-connector.adoc
+++ b/connectors/camel-kafka-kafka-connector/src/main/docs/camel-kafka-kafka-source-connector.adoc
@@ -51,8 +51,8 @@ The camel-kafka source connector supports 121 options, which are listed below.
 | *camel.source.endpoint.fetchMinBytes* | The minimum amount of data the server should return for a fetch request. If insufficient data is available the request will wait for that much data to accumulate before answering the request. | "1" | false | MEDIUM
 | *camel.source.endpoint.fetchWaitMaxMs* | The maximum amount of time the server will block before answering the fetch request if there isn't sufficient data to immediately satisfy fetch.min.bytes | "500" | false | MEDIUM
 | *camel.source.endpoint.groupId* | A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers. | null | false | MEDIUM
+| *camel.source.endpoint.headerDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.source.endpoint.heartbeatIntervalMs* | The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower to control the expected time for normal r [...]
-| *camel.source.endpoint.kafkaHeaderDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.source.endpoint.keyDeserializer* | Deserializer class for key that implements the Deserializer interface. | "org.apache.kafka.common.serialization.StringDeserializer" | false | MEDIUM
 | *camel.source.endpoint.maxPartitionFetchBytes* | The maximum amount of data per-partition the server will return. The maximum total memory used for a request will be #partitions max.partition.fetch.bytes. This size must be at least as large as the maximum message size the server allows or else it is possible for the producer to send messages larger than the consumer can fetch. If that happens, the consumer can get stuck trying to fetch a large message on a certain partition. | "1048576 [...]
 | *camel.source.endpoint.maxPollIntervalMs* | The maximum delay between invocations of poll() when using consumer group management. This places an upper bound on the amount of time that the consumer can be idle before fetching more records. If poll() is not called before expiration of this timeout, then the consumer is considered failed and the group will rebalance in order to reassign the partitions to another member. | null | false | MEDIUM
@@ -112,8 +112,8 @@ The camel-kafka source connector supports 121 options, which are listed below.
 | *camel.component.kafka.fetchMinBytes* | The minimum amount of data the server should return for a fetch request. If insufficient data is available the request will wait for that much data to accumulate before answering the request. | "1" | false | MEDIUM
 | *camel.component.kafka.fetchWaitMaxMs* | The maximum amount of time the server will block before answering the fetch request if there isn't sufficient data to immediately satisfy fetch.min.bytes | "500" | false | MEDIUM
 | *camel.component.kafka.groupId* | A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers. | null | false | MEDIUM
+| *camel.component.kafka.headerDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.component.kafka.heartbeatIntervalMs* | The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower to control the expected time for normal r [...]
-| *camel.component.kafka.kafkaHeaderDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.component.kafka.keyDeserializer* | Deserializer class for key that implements the Deserializer interface. | "org.apache.kafka.common.serialization.StringDeserializer" | false | MEDIUM
 | *camel.component.kafka.maxPartitionFetchBytes* | The maximum amount of data per-partition the server will return. The maximum total memory used for a request will be #partitions max.partition.fetch.bytes. This size must be at least as large as the maximum message size the server allows or else it is possible for the producer to send messages larger than the consumer can fetch. If that happens, the consumer can get stuck trying to fetch a large message on a certain partition. | "1048576 [...]
 | *camel.component.kafka.maxPollIntervalMs* | The maximum delay between invocations of poll() when using consumer group management. This places an upper bound on the amount of time that the consumer can be idle before fetching more records. If poll() is not called before expiration of this timeout, then the consumer is considered failed and the group will rebalance in order to reassign the partitions to another member. | null | false | MEDIUM
diff --git a/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSinkConnectorConfig.java b/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSinkConnectorConfig.java
index 9fa2602..307a6b4 100644
--- a/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSinkConnectorConfig.java
+++ b/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSinkConnectorConfig.java
@@ -57,15 +57,15 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_ENABLE_IDEMPOTENCE_CONF = "camel.sink.endpoint.enableIdempotence";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_ENABLE_IDEMPOTENCE_DOC = "If set to 'true' the producer will ensure that exactly one copy of each message is written in the stream. If 'false', producer retries may write duplicates of the retried message in the stream. If set to true this option will require max.in.flight.requests.per.connection to be set to 1 and retries cannot be zero and additionally acks must be set to 'all'.";
     public static final Boolean CAMEL_SINK_KAFKA_ENDPOINT_ENABLE_IDEMPOTENCE_DEFAULT = false;
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KAFKA_HEADER_SERIALIZER_CONF = "camel.sink.endpoint.kafkaHeaderSerializer";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KAFKA_HEADER_SERIALIZER_DOC = "To use a custom KafkaHeaderSerializer to serialize kafka headers values";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KAFKA_HEADER_SERIALIZER_DEFAULT = null;
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_HEADER_SERIALIZER_CONF = "camel.sink.endpoint.headerSerializer";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_HEADER_SERIALIZER_DOC = "To use a custom KafkaHeaderSerializer to serialize kafka headers values";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_HEADER_SERIALIZER_DEFAULT = null;
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_CONF = "camel.sink.endpoint.key";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_DOC = "The record key (or null if no key is specified). If this option has been configured then it take precedence over header KafkaConstants#KEY";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CLASS_CONF = "camel.sink.endpoint.keySerializerClass";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CLASS_DOC = "The serializer class for keys (defaults to the same as for messages if nothing is given).";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CLASS_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CONF = "camel.sink.endpoint.keySerializer";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_DOC = "The serializer class for keys (defaults to the same as for messages if nothing is given).";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when [...]
     public static final Boolean CAMEL_SINK_KAFKA_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
@@ -129,9 +129,9 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_SEND_BUFFER_BYTES_CONF = "camel.sink.endpoint.sendBufferBytes";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_SEND_BUFFER_BYTES_DOC = "Socket write buffer size";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_SEND_BUFFER_BYTES_DEFAULT = "131072";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_SERIALIZER_CLASS_CONF = "camel.sink.endpoint.serializerClass";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_SERIALIZER_CLASS_DOC = "The serializer class for messages.";
-    public static final String CAMEL_SINK_KAFKA_ENDPOINT_SERIALIZER_CLASS_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_VALUE_SERIALIZER_CONF = "camel.sink.endpoint.valueSerializer";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_VALUE_SERIALIZER_DOC = "The serializer class for messages.";
+    public static final String CAMEL_SINK_KAFKA_ENDPOINT_VALUE_SERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_CONF = "camel.sink.endpoint.workerPool";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_DOC = "To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed.";
     public static final String CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_DEFAULT = null;
@@ -258,15 +258,15 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_KAFKA_COMPONENT_ENABLE_IDEMPOTENCE_CONF = "camel.component.kafka.enableIdempotence";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_ENABLE_IDEMPOTENCE_DOC = "If set to 'true' the producer will ensure that exactly one copy of each message is written in the stream. If 'false', producer retries may write duplicates of the retried message in the stream. If set to true this option will require max.in.flight.requests.per.connection to be set to 1 and retries cannot be zero and additionally acks must be set to 'all'.";
     public static final Boolean CAMEL_SINK_KAFKA_COMPONENT_ENABLE_IDEMPOTENCE_DEFAULT = false;
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_KAFKA_HEADER_SERIALIZER_CONF = "camel.component.kafka.kafkaHeaderSerializer";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_KAFKA_HEADER_SERIALIZER_DOC = "To use a custom KafkaHeaderSerializer to serialize kafka headers values";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_KAFKA_HEADER_SERIALIZER_DEFAULT = null;
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_HEADER_SERIALIZER_CONF = "camel.component.kafka.headerSerializer";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_HEADER_SERIALIZER_DOC = "To use a custom KafkaHeaderSerializer to serialize kafka headers values";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_HEADER_SERIALIZER_DEFAULT = null;
     public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_CONF = "camel.component.kafka.key";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_DOC = "The record key (or null if no key is specified). If this option has been configured then it take precedence over header KafkaConstants#KEY";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CLASS_CONF = "camel.component.kafka.keySerializerClass";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CLASS_DOC = "The serializer class for keys (defaults to the same as for messages if nothing is given).";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CLASS_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CONF = "camel.component.kafka.keySerializer";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_DOC = "The serializer class for keys (defaults to the same as for messages if nothing is given).";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.kafka.lazyStartProducer";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that whe [...]
     public static final Boolean CAMEL_SINK_KAFKA_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
@@ -330,9 +330,9 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_KAFKA_COMPONENT_SEND_BUFFER_BYTES_CONF = "camel.component.kafka.sendBufferBytes";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_SEND_BUFFER_BYTES_DOC = "Socket write buffer size";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_SEND_BUFFER_BYTES_DEFAULT = "131072";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_SERIALIZER_CLASS_CONF = "camel.component.kafka.serializerClass";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_SERIALIZER_CLASS_DOC = "The serializer class for messages.";
-    public static final String CAMEL_SINK_KAFKA_COMPONENT_SERIALIZER_CLASS_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_VALUE_SERIALIZER_CONF = "camel.component.kafka.valueSerializer";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_VALUE_SERIALIZER_DOC = "The serializer class for messages.";
+    public static final String CAMEL_SINK_KAFKA_COMPONENT_VALUE_SERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringSerializer";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_CONF = "camel.component.kafka.workerPool";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_DOC = "To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed.";
     public static final String CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_DEFAULT = null;
@@ -450,9 +450,9 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_COMPRESSION_CODEC_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_COMPRESSION_CODEC_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_COMPRESSION_CODEC_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_CONNECTION_MAX_IDLE_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_CONNECTION_MAX_IDLE_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_CONNECTION_MAX_IDLE_MS_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_ENABLE_IDEMPOTENCE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KAFKA_ENDPOINT_ENABLE_IDEMPOTENCE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_ENABLE_IDEMPOTENCE_DOC);
-        conf.define(CAMEL_SINK_KAFKA_ENDPOINT_KAFKA_HEADER_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_KAFKA_HEADER_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_KAFKA_HEADER_SERIALIZER_DOC);
+        conf.define(CAMEL_SINK_KAFKA_ENDPOINT_HEADER_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_HEADER_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_HEADER_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_KEY_DOC);
-        conf.define(CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CLASS_DOC);
+        conf.define(CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_KEY_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KAFKA_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_LINGER_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_LINGER_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_LINGER_MS_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_MAX_BLOCK_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_MAX_BLOCK_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_MAX_BLOCK_MS_DOC);
@@ -474,7 +474,7 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_RETRIES_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_RETRIES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_RETRIES_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_RETRY_BACKOFF_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_RETRY_BACKOFF_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_RETRY_BACKOFF_MS_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_SEND_BUFFER_BYTES_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_SEND_BUFFER_BYTES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_SEND_BUFFER_BYTES_DOC);
-        conf.define(CAMEL_SINK_KAFKA_ENDPOINT_SERIALIZER_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_SERIALIZER_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_SERIALIZER_CLASS_DOC);
+        conf.define(CAMEL_SINK_KAFKA_ENDPOINT_VALUE_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_VALUE_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_VALUE_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_CORE_SIZE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_CORE_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_CORE_SIZE_DOC);
         conf.define(CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_MAX_SIZE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_MAX_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_ENDPOINT_WORKER_POOL_MAX_SIZE_DOC);
@@ -517,9 +517,9 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_COMPRESSION_CODEC_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_COMPRESSION_CODEC_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_COMPRESSION_CODEC_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_CONNECTION_MAX_IDLE_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_CONNECTION_MAX_IDLE_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_CONNECTION_MAX_IDLE_MS_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_ENABLE_IDEMPOTENCE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KAFKA_COMPONENT_ENABLE_IDEMPOTENCE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_ENABLE_IDEMPOTENCE_DOC);
-        conf.define(CAMEL_SINK_KAFKA_COMPONENT_KAFKA_HEADER_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_KAFKA_HEADER_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_KAFKA_HEADER_SERIALIZER_DOC);
+        conf.define(CAMEL_SINK_KAFKA_COMPONENT_HEADER_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_HEADER_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_HEADER_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_KEY_DOC);
-        conf.define(CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CLASS_DOC);
+        conf.define(CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_KEY_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KAFKA_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_LINGER_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_LINGER_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_LINGER_MS_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_MAX_BLOCK_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_MAX_BLOCK_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_MAX_BLOCK_MS_DOC);
@@ -541,7 +541,7 @@ public class CamelKafkaSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_RETRIES_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_RETRIES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_RETRIES_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_RETRY_BACKOFF_MS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_RETRY_BACKOFF_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_RETRY_BACKOFF_MS_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_SEND_BUFFER_BYTES_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_SEND_BUFFER_BYTES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_SEND_BUFFER_BYTES_DOC);
-        conf.define(CAMEL_SINK_KAFKA_COMPONENT_SERIALIZER_CLASS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_SERIALIZER_CLASS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_SERIALIZER_CLASS_DOC);
+        conf.define(CAMEL_SINK_KAFKA_COMPONENT_VALUE_SERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_VALUE_SERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_VALUE_SERIALIZER_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_CORE_SIZE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_CORE_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_CORE_SIZE_DOC);
         conf.define(CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_MAX_SIZE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_MAX_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KAFKA_COMPONENT_WORKER_POOL_MAX_SIZE_DOC);
diff --git a/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSourceConnectorConfig.java b/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSourceConnectorConfig.java
index 9c7d084..255baa8 100644
--- a/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSourceConnectorConfig.java
+++ b/connectors/camel-kafka-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kafka/CamelKafkaSourceConnectorConfig.java
@@ -92,12 +92,12 @@ public class CamelKafkaSourceConnectorConfig
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_GROUP_ID_CONF = "camel.source.endpoint.groupId";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_GROUP_ID_DOC = "A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers.";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_GROUP_ID_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_HEADER_DESERIALIZER_CONF = "camel.source.endpoint.headerDeserializer";
+    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_HEADER_DESERIALIZER_DOC = "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values";
+    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_HEADER_DESERIALIZER_DEFAULT = null;
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_HEARTBEAT_INTERVAL_MS_CONF = "camel.source.endpoint.heartbeatIntervalMs";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_HEARTBEAT_INTERVAL_MS_DOC = "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower t [...]
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_HEARTBEAT_INTERVAL_MS_DEFAULT = "3000";
-    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_KAFKA_HEADER_DESERIALIZER_CONF = "camel.source.endpoint.kafkaHeaderDeserializer";
-    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_KAFKA_HEADER_DESERIALIZER_DOC = "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values";
-    public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_KAFKA_HEADER_DESERIALIZER_DEFAULT = null;
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_KEY_DESERIALIZER_CONF = "camel.source.endpoint.keyDeserializer";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_KEY_DESERIALIZER_DOC = "Deserializer class for key that implements the Deserializer interface.";
     public static final String CAMEL_SOURCE_KAFKA_ENDPOINT_KEY_DESERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringDeserializer";
@@ -275,12 +275,12 @@ public class CamelKafkaSourceConnectorConfig
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_GROUP_ID_CONF = "camel.component.kafka.groupId";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_GROUP_ID_DOC = "A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers.";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_GROUP_ID_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_HEADER_DESERIALIZER_CONF = "camel.component.kafka.headerDeserializer";
+    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_HEADER_DESERIALIZER_DOC = "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values";
+    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_HEADER_DESERIALIZER_DEFAULT = null;
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_HEARTBEAT_INTERVAL_MS_CONF = "camel.component.kafka.heartbeatIntervalMs";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_HEARTBEAT_INTERVAL_MS_DOC = "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower  [...]
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_HEARTBEAT_INTERVAL_MS_DEFAULT = "3000";
-    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_HEADER_DESERIALIZER_CONF = "camel.component.kafka.kafkaHeaderDeserializer";
-    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_HEADER_DESERIALIZER_DOC = "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values";
-    public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_HEADER_DESERIALIZER_DEFAULT = null;
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KEY_DESERIALIZER_CONF = "camel.component.kafka.keyDeserializer";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KEY_DESERIALIZER_DOC = "Deserializer class for key that implements the Deserializer interface.";
     public static final String CAMEL_SOURCE_KAFKA_COMPONENT_KEY_DESERIALIZER_DEFAULT = "org.apache.kafka.common.serialization.StringDeserializer";
@@ -424,8 +424,8 @@ public class CamelKafkaSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_FETCH_MIN_BYTES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_FETCH_MIN_BYTES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_FETCH_MIN_BYTES_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_FETCH_WAIT_MAX_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_FETCH_WAIT_MAX_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_FETCH_WAIT_MAX_MS_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_GROUP_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_GROUP_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_GROUP_ID_DOC);
+        conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_HEADER_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_HEADER_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_HEADER_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_HEARTBEAT_INTERVAL_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_HEARTBEAT_INTERVAL_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_HEARTBEAT_INTERVAL_MS_DOC);
-        conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_KAFKA_HEADER_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_KAFKA_HEADER_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_KAFKA_HEADER_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_KEY_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_KEY_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_KEY_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_PARTITION_FETCH_BYTES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_PARTITION_FETCH_BYTES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_PARTITION_FETCH_BYTES_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_POLL_INTERVAL_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_POLL_INTERVAL_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_ENDPOINT_MAX_POLL_INTERVAL_MS_DOC);
@@ -485,8 +485,8 @@ public class CamelKafkaSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_FETCH_MIN_BYTES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_FETCH_MIN_BYTES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_FETCH_MIN_BYTES_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_FETCH_WAIT_MAX_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_FETCH_WAIT_MAX_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_FETCH_WAIT_MAX_MS_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_GROUP_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_GROUP_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_GROUP_ID_DOC);
+        conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_HEADER_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_HEADER_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_HEADER_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_HEARTBEAT_INTERVAL_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_HEARTBEAT_INTERVAL_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_HEARTBEAT_INTERVAL_MS_DOC);
-        conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_HEADER_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_HEADER_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_KAFKA_HEADER_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_KEY_DESERIALIZER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_KEY_DESERIALIZER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_KEY_DESERIALIZER_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_MAX_PARTITION_FETCH_BYTES_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_MAX_PARTITION_FETCH_BYTES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_MAX_PARTITION_FETCH_BYTES_DOC);
         conf.define(CAMEL_SOURCE_KAFKA_COMPONENT_MAX_POLL_INTERVAL_MS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KAFKA_COMPONENT_MAX_POLL_INTERVAL_MS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KAFKA_COMPONENT_MAX_POLL_INTERVAL_MS_DOC);
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/pom.xml b/connectors/camel-kubernetes-custom-resources-kafka-connector/pom.xml
new file mode 100644
index 0000000..fab4a01
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.camel.kafkaconnector</groupId>
+    <artifactId>connectors</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>camel-kubernetes-custom-resources-kafka-connector</artifactId>
+  <name>Camel-Kafka-Connector :: kubernetes-custom-resources</name>
+  <description>Camel Kafka Connector for kubernetes-custom-resources</description>
+  <dependencies>
+    <!-- Kafka -->
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>connect-transforms</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Camel -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-kubernetes</artifactId>
+    </dependency>
+    <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel.kafkaconnector</groupId>
+      <artifactId>camel-kafka-connector</artifactId>
+    </dependency>
+    <!--END OF GENERATED CODE-->
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${version.maven.surefire.plugin}</version>
+        <configuration>
+          <failIfNoTests>false</failIfNoTests>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${version.maven.jar}</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.5.3</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/package.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <!--START OF GENERATED CODE-->
+  <repositories>
+    <!-- camel-jira -->
+    <repository>
+      <id>atlassian-public</id>
+      <url>https://packages.atlassian.com/maven-external</url>
+      <name>Atlassian Public Repo</name>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <!-- camel-ipfs and camel-weka -->
+    <repository>
+      <id>jboss.thirdparty</id>
+      <name>JBoss Thirdparty Repository</name>
+      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  <!--END OF GENERATED CODE-->
+</project>
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/descriptors/connector-sink.properties b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/descriptors/connector-sink.properties
new file mode 100644
index 0000000..b0d326b
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/descriptors/connector-sink.properties
@@ -0,0 +1 @@
+camel-kubernetes-custom-resources-sink
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/descriptors/connector-source.properties b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/descriptors/connector-source.properties
new file mode 100644
index 0000000..eacedbd
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/descriptors/connector-source.properties
@@ -0,0 +1 @@
+camel-kubernetes-custom-resources-source
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/resources/camel-kubernetes-custom-resources-sink.json
similarity index 51%
copy from camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
copy to connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/resources/camel-kubernetes-custom-resources-sink.json
index 4fe21c2..bff86b3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/resources/camel-kubernetes-custom-resources-sink.json
@@ -1,61 +1,48 @@
 {
 	"connector": {
-		"class": "org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSinkConnector",
-		"artifactId": "camel-couchbase-kafka-connector",
+		"class": "org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSinkConnector",
+		"artifactId": "camel-kubernetes-custom-resources-kafka-connector",
 		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-couchbase-sink",
+		"id": "camel-kubernetes-custom-resources-sink",
 		"type": "sink",
 		"version": "0.7.0-SNAPSHOT",
-		"description": "Query Couchbase Views with a poll strategy and\/or perform various operations against Couchbase databases."
+		"description": "Perform operations on Kubernetes Custom Resources and get notified on Deployment changes."
 	},
 	"properties": {
-		"camel.sink.path.protocol": {
-			"name": "camel.sink.path.protocol",
-			"description": "The protocol to use",
+		"camel.sink.path.masterUrl": {
+			"name": "camel.sink.path.masterUrl",
+			"description": "Kubernetes Master url",
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.path.hostname": {
-			"name": "camel.sink.path.hostname",
-			"description": "The hostname to use",
-			"priority": "HIGH",
-			"required": "true"
-		},
-		"camel.sink.path.port": {
-			"name": "camel.sink.path.port",
-			"description": "The port number to use",
-			"defaultValue": "8091",
+		"camel.sink.endpoint.apiVersion": {
+			"name": "camel.sink.endpoint.apiVersion",
+			"description": "The Kubernetes API Version to use",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.bucket": {
-			"name": "camel.sink.endpoint.bucket",
-			"description": "The bucket to use",
+		"camel.sink.endpoint.dnsDomain": {
+			"name": "camel.sink.endpoint.dnsDomain",
+			"description": "The dns domain, used for ServiceCall EIP",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.collection": {
-			"name": "camel.sink.endpoint.collection",
-			"description": "The collection to use",
+		"camel.sink.endpoint.kubernetesClient": {
+			"name": "camel.sink.endpoint.kubernetesClient",
+			"description": "Default KubernetesClient to use if provided",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.key": {
-			"name": "camel.sink.endpoint.key",
-			"description": "The key to use",
+		"camel.sink.endpoint.portName": {
+			"name": "camel.sink.endpoint.portName",
+			"description": "The port name, used for ServiceCall EIP",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.scope": {
-			"name": "camel.sink.endpoint.scope",
-			"description": "The scope to use",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
-		"camel.sink.endpoint.autoStartIdForInserts": {
-			"name": "camel.sink.endpoint.autoStartIdForInserts",
-			"description": "Define if we want an autostart Id when we are doing an insert operation",
-			"defaultValue": "false",
+		"camel.sink.endpoint.portProtocol": {
+			"name": "camel.sink.endpoint.portProtocol",
+			"description": "The port protocol, used for ServiceCall EIP",
+			"defaultValue": "\"tcp\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -68,97 +55,115 @@
 		},
 		"camel.sink.endpoint.operation": {
 			"name": "camel.sink.endpoint.operation",
-			"description": "The operation to do",
-			"defaultValue": "\"CCB_PUT\"",
+			"description": "Producer operation to do on Kubernetes",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.persistTo": {
-			"name": "camel.sink.endpoint.persistTo",
-			"description": "Where to persist the data",
-			"defaultValue": "0",
+		"camel.sink.endpoint.basicPropertyBinding": {
+			"name": "camel.sink.endpoint.basicPropertyBinding",
+			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.producerRetryAttempts": {
-			"name": "camel.sink.endpoint.producerRetryAttempts",
-			"description": "Define the number of retry attempts",
-			"defaultValue": "2",
+		"camel.sink.endpoint.connectionTimeout": {
+			"name": "camel.sink.endpoint.connectionTimeout",
+			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.producerRetryPause": {
-			"name": "camel.sink.endpoint.producerRetryPause",
-			"description": "Define the retry pause between different attempts",
-			"defaultValue": "5000",
+		"camel.sink.endpoint.synchronous": {
+			"name": "camel.sink.endpoint.synchronous",
+			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
+			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.replicateTo": {
-			"name": "camel.sink.endpoint.replicateTo",
-			"description": "Where to replicate the data",
-			"defaultValue": "0",
+		"camel.sink.endpoint.caCertData": {
+			"name": "camel.sink.endpoint.caCertData",
+			"description": "The CA Cert Data",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.startingIdForInsertsFrom": {
-			"name": "camel.sink.endpoint.startingIdForInsertsFrom",
-			"description": "Define the starting Id where we are doing an insert operation",
+		"camel.sink.endpoint.caCertFile": {
+			"name": "camel.sink.endpoint.caCertFile",
+			"description": "The CA Cert File",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.additionalHosts": {
-			"name": "camel.sink.endpoint.additionalHosts",
-			"description": "The additional hosts",
+		"camel.sink.endpoint.clientCertData": {
+			"name": "camel.sink.endpoint.clientCertData",
+			"description": "The Client Cert Data",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
+		"camel.sink.endpoint.clientCertFile": {
+			"name": "camel.sink.endpoint.clientCertFile",
+			"description": "The Client Cert File",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.queryTimeout": {
-			"name": "camel.sink.endpoint.queryTimeout",
-			"description": "Define the operation timeout in milliseconds",
-			"defaultValue": "2500L",
+		"camel.sink.endpoint.clientKeyAlgo": {
+			"name": "camel.sink.endpoint.clientKeyAlgo",
+			"description": "The Key Algorithm used by the client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.synchronous": {
-			"name": "camel.sink.endpoint.synchronous",
-			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
-			"defaultValue": "false",
+		"camel.sink.endpoint.clientKeyData": {
+			"name": "camel.sink.endpoint.clientKeyData",
+			"description": "The Client Key data",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.clientKeyFile": {
+			"name": "camel.sink.endpoint.clientKeyFile",
+			"description": "The Client Key file",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.clientKeyPassphrase": {
+			"name": "camel.sink.endpoint.clientKeyPassphrase",
+			"description": "The Client Key Passphrase",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.oauthToken": {
+			"name": "camel.sink.endpoint.oauthToken",
+			"description": "The Auth Token",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.sink.endpoint.password": {
 			"name": "camel.sink.endpoint.password",
-			"description": "The password to use",
+			"description": "Password to connect to Kubernetes",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.trustCerts": {
+			"name": "camel.sink.endpoint.trustCerts",
+			"description": "Define if the certs we used are trusted anyway or not",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.sink.endpoint.username": {
 			"name": "camel.sink.endpoint.username",
-			"description": "The username to use",
+			"description": "Username to connect to Kubernetes",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.couchbase.lazyStartProducer": {
-			"name": "camel.component.couchbase.lazyStartProducer",
+		"camel.component.kubernetes-custom-resources.lazyStartProducer": {
+			"name": "camel.component.kubernetes-custom-resources.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.couchbase.basicPropertyBinding": {
-			"name": "camel.component.couchbase.basicPropertyBinding",
+		"camel.component.kubernetes-custom-resources.basicPropertyBinding": {
+			"name": "camel.component.kubernetes-custom-resources.basicPropertyBinding",
 			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
 			"defaultValue": "false",
 			"priority": "LOW",
 			"required": "false"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/resources/camel-kubernetes-custom-resources-source.json
similarity index 81%
copy from camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
copy to connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/resources/camel-kubernetes-custom-resources-source.json
index 0088ab1..740c5a2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/generated/resources/camel-kubernetes-custom-resources-source.json
@@ -1,12 +1,12 @@
 {
 	"connector": {
-		"class": "org.apache.camel.kafkaconnector.kuberneteshpa.CamelKuberneteshpaSourceConnector",
-		"artifactId": "camel-kubernetes-hpa-kafka-connector",
+		"class": "org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSourceConnector",
+		"artifactId": "camel-kubernetes-custom-resources-kafka-connector",
 		"groupId": "org.apache.camel.kafkaconnector",
-		"id": "camel-kubernetes-hpa-source",
+		"id": "camel-kubernetes-custom-resources-source",
 		"type": "source",
 		"version": "0.7.0-SNAPSHOT",
-		"description": "Perform operations on Kubernetes Horizontal Pod Autoscalers (HPA) and get notified on HPA changes."
+		"description": "Perform operations on Kubernetes Custom Resources and get notified on Deployment changes."
 	},
 	"properties": {
 		"camel.source.path.masterUrl": {
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
@@ -188,19 +218,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-hpa.bridgeErrorHandler": {
-			"name": "camel.component.kubernetes-hpa.bridgeErrorHandler",
+		"camel.component.kubernetes-custom-resources.bridgeErrorHandler": {
+			"name": "camel.component.kubernetes-custom-resources.bridgeErrorHandler",
 			"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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-hpa.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-hpa.basicPropertyBinding",
+		"camel.component.kubernetes-custom-resources.basicPropertyBinding": {
+			"name": "camel.component.kubernetes-custom-resources.basicPropertyBinding",
 			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
 			"defaultValue": "false",
 			"priority": "LOW",
 			"required": "false"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/assembly/package.xml b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/assembly/package.xml
new file mode 100644
index 0000000..4fd2529
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/assembly/package.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<assembly>
+  <!-- Assembles a packaged version targeting OS installation. -->
+  <id>package</id>
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/../..</directory>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>licenses/</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/src/main/docs</directory>
+      <outputDirectory>docs/</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>${project.artifactId}/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <excludes>
+        <exclude>org.apache.kafka:connect-api</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/camel-kubernetes-custom-resources-kafka-sink-connector.adoc b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/camel-kubernetes-custom-resources-kafka-sink-connector.adoc
new file mode 100644
index 0000000..7eef4e7
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/camel-kubernetes-custom-resources-kafka-sink-connector.adoc
@@ -0,0 +1,78 @@
+// kafka-connector options: START
+[[camel-kubernetes-custom-resources-kafka-connector-sink]]
+= camel-kubernetes-custom-resources-kafka-connector sink configuration
+
+When using camel-kubernetes-custom-resources-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-kubernetes-custom-resources-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSinkConnector
+----
+
+
+The camel-kubernetes-custom-resources sink connector supports 25 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.masterUrl* | Kubernetes Master url | null | true | HIGH
+| *camel.sink.endpoint.apiVersion* | The Kubernetes API Version to use | null | false | MEDIUM
+| *camel.sink.endpoint.dnsDomain* | The dns domain, used for ServiceCall EIP | null | false | MEDIUM
+| *camel.sink.endpoint.kubernetesClient* | Default KubernetesClient to use if provided | null | false | MEDIUM
+| *camel.sink.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
+| *camel.sink.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
+| *camel.sink.endpoint.operation* | Producer operation to do on Kubernetes | null | false | MEDIUM
+| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
+| *camel.sink.endpoint.connectionTimeout* | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. | null | false | MEDIUM
+| *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
+| *camel.sink.endpoint.caCertData* | The CA Cert Data | null | false | MEDIUM
+| *camel.sink.endpoint.caCertFile* | The CA Cert File | null | false | MEDIUM
+| *camel.sink.endpoint.clientCertData* | The Client Cert Data | null | false | MEDIUM
+| *camel.sink.endpoint.clientCertFile* | The Client Cert File | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyAlgo* | The Key Algorithm used by the client | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyData* | The Client Key data | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyFile* | The Client Key file | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyPassphrase* | The Client Key Passphrase | null | false | MEDIUM
+| *camel.sink.endpoint.oauthToken* | The Auth Token | null | false | MEDIUM
+| *camel.sink.endpoint.password* | Password to connect to Kubernetes | null | false | MEDIUM
+| *camel.sink.endpoint.trustCerts* | Define if the certs we used are trusted anyway or not | null | false | MEDIUM
+| *camel.sink.endpoint.username* | Username to connect to Kubernetes | null | false | MEDIUM
+| *camel.component.kubernetes-custom-resources.lazy StartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first mess [...]
+| *camel.component.kubernetes-custom-resources.basic PropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+|===
+
+
+
+The camel-kubernetes-custom-resources sink connector has no converters out of the box.
+
+
+
+
+
+The camel-kubernetes-custom-resources sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-kubernetes-custom-resources sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/camel-kubernetes-custom-resources-kafka-source-connector.adoc
similarity index 66%
copy from connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
copy to connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/camel-kubernetes-custom-resources-kafka-source-connector.adoc
index 8268d5a..392112e 100644
--- a/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/camel-kubernetes-custom-resources-kafka-source-connector.adoc
@@ -1,14 +1,14 @@
 // kafka-connector options: START
-[[camel-kubernetes-pods-kafka-connector-source]]
-= camel-kubernetes-pods-kafka-connector source configuration
+[[camel-kubernetes-custom-resources-kafka-connector-source]]
+= camel-kubernetes-custom-resources-kafka-connector source configuration
 
-When using camel-kubernetes-pods-kafka-connector as source make sure to use the following Maven dependency to have support for the connector:
+When using camel-kubernetes-custom-resources-kafka-connector as source make sure to use the following Maven dependency to have support for the connector:
 
 [source,xml]
 ----
 <dependency>
   <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-kubernetes-pods-kafka-connector</artifactId>
+  <artifactId>camel-kubernetes-custom-resources-kafka-connector</artifactId>
   <version>x.x.x</version>
   <!-- use the same version as your Camel Kafka connector version -->
 </dependency>
@@ -18,11 +18,11 @@ To use this Source connector in Kafka connect you'll need to set the following c
 
 [source,java]
 ----
-connector.class=org.apache.camel.kafkaconnector.kubernetespods.CamelKubernetespodsSourceConnector
+connector.class=org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSourceConnector
 ----
 
 
-The camel-kubernetes-pods source connector supports 31 options, which are listed below.
+The camel-kubernetes-custom-resources source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-pods source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
@@ -58,23 +63,27 @@ The camel-kubernetes-pods source connector supports 31 options, which are listed
 | *camel.source.endpoint.password* | Password to connect to Kubernetes | null | false | MEDIUM
 | *camel.source.endpoint.trustCerts* | Define if the certs we used are trusted anyway or not | null | false | MEDIUM
 | *camel.source.endpoint.username* | Username to connect to Kubernetes | null | false | MEDIUM
-| *camel.component.kubernetes-pods.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.kubernetes-pods.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.kubernetes-custom-resources.bridge ErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | fal [...]
+| *camel.component.kubernetes-custom-resources.basic PropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
 |===
 
 
 
-The camel-kubernetes-pods sink connector has no converters out of the box.
+The camel-kubernetes-custom-resources sink connector has no converters out of the box.
 
 
 
 
 
-The camel-kubernetes-pods sink connector has no transforms out of the box.
+The camel-kubernetes-custom-resources sink connector has no transforms out of the box.
 
 
 
 
 
-The camel-kubernetes-pods sink connector has no aggregation strategies out of the box.
+The camel-kubernetes-custom-resources sink connector has no aggregation strategies out of the box.
+
+
+
+
 // kafka-connector options: END
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/examples/CamelKubernetescustomresourcesSinkConnector.properties
similarity index 85%
copy from connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
copy to connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/examples/CamelKubernetescustomresourcesSinkConnector.properties
index fdebdc2..f39c901 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSinkConnector.properties
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/examples/CamelKubernetescustomresourcesSinkConnector.properties
@@ -15,8 +15,8 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-name=CamelCouchbaseSinkConnector
-connector.class=org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSinkConnector
+name=CamelKubernetes-custom-resourcesSinkConnector
+connector.class=org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSinkConnector
 tasks.max=1
 
 # use the kafka converters that better suit your needs, these are just defaults:
@@ -28,8 +28,6 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The hostname to use
-camel.sink.path.hostname=
-# The protocol to use
-camel.sink.path.protocol=
+# Kubernetes Master url
+camel.sink.path.masterUrl=
 
diff --git a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/examples/CamelKubernetescustomresourcesSourceConnector.properties
similarity index 85%
copy from connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties
copy to connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/examples/CamelKubernetescustomresourcesSourceConnector.properties
index 142739b..5763aac 100644
--- a/connectors/camel-couchbase-kafka-connector/src/main/docs/examples/CamelCouchbaseSourceConnector.properties
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/docs/examples/CamelKubernetescustomresourcesSourceConnector.properties
@@ -15,8 +15,8 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-name=CamelCouchbaseSourceConnector
-connector.class=org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSourceConnector
+name=CamelKubernetes-custom-resourcesSourceConnector
+connector.class=org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSourceConnector
 tasks.max=1
 
 # use the kafka converters that better suit your needs, these are just defaults:
@@ -28,8 +28,6 @@ topics=
 
 # mandatory properties (for a complete properties list see the connector documentation):
 
-# The hostname to use
-camel.source.path.hostname=
-# The protocol to use
-camel.source.path.protocol=
+# Kubernetes Master url
+camel.source.path.masterUrl=
 
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkConnector.java b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkConnector.java
new file mode 100644
index 0000000..1661951
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkConnector.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.kubernetescustomresources;
+
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnector;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.Task;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelKubernetescustomresourcesSinkConnector
+        extends
+            CamelSinkConnector {
+
+    @Override
+    public ConfigDef config() {
+        return CamelKubernetescustomresourcesSinkConnectorConfig.conf();
+    }
+    @Override
+    public Class<? extends Task> taskClass() {
+        return CamelKubernetescustomresourcesSinkTask.class;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkConnectorConfig.java b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkConnectorConfig.java
new file mode 100644
index 0000000..176107b
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkConnectorConfig.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.kubernetescustomresources;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelKubernetescustomresourcesSinkConnectorConfig
+        extends
+            CamelSinkConnectorConfig {
+
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_CONF = "camel.sink.path.masterUrl";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DOC = "Kubernetes Master url";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_CONF = "camel.sink.endpoint.apiVersion";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DOC = "The Kubernetes API Version to use";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_CONF = "camel.sink.endpoint.dnsDomain";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DOC = "The dns domain, used for ServiceCall EIP";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_CONF = "camel.sink.endpoint.kubernetesClient";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DOC = "Default KubernetesClient to use if provided";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_CONF = "camel.sink.endpoint.portName";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DOC = "The port name, used for ServiceCall EIP";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_CONF = "camel.sink.endpoint.portProtocol";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DOC = "The port protocol, used for ServiceCall EIP";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DEFAULT = "tcp";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handle [...]
+    public static final Boolean CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OPERATION_DOC = "Producer operation to do on Kubernetes";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OPERATION_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
+    public static final Boolean CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_CONF = "camel.sink.endpoint.connectionTimeout";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DOC = "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
+    public static final Boolean CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_CONF = "camel.sink.endpoint.caCertData";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DOC = "The CA Cert Data";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_CONF = "camel.sink.endpoint.caCertFile";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DOC = "The CA Cert File";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_CONF = "camel.sink.endpoint.clientCertData";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DOC = "The Client Cert Data";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_CONF = "camel.sink.endpoint.clientCertFile";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DOC = "The Client Cert File";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_CONF = "camel.sink.endpoint.clientKeyAlgo";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DOC = "The Key Algorithm used by the client";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_CONF = "camel.sink.endpoint.clientKeyData";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DOC = "The Client Key data";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_CONF = "camel.sink.endpoint.clientKeyFile";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DOC = "The Client Key file";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_CONF = "camel.sink.endpoint.clientKeyPassphrase";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DOC = "The Client Key Passphrase";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_CONF = "camel.sink.endpoint.oauthToken";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DOC = "The Auth Token";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_CONF = "camel.sink.endpoint.password";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DOC = "Password to connect to Kubernetes";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_CONF = "camel.sink.endpoint.trustCerts";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DOC = "Define if the certs we used are trusted anyway or not";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_CONF = "camel.sink.endpoint.username";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DOC = "Username to connect to Kubernetes";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DEFAULT = null;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.kubernetes-custom-resources.lazyStartProducer";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handl [...]
+    public static final Boolean CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.kubernetes-custom-resources.basicPropertyBinding";
+    public static final String CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
+    public static final Boolean CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+
+    public CamelKubernetescustomresourcesSinkConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelKubernetescustomresourcesSinkConnectorConfig(
+            Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OPERATION_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_LAZY_START_PRODUCER_DOC);
+        conf.define(CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkTask.java b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkTask.java
new file mode 100644
index 0000000..c177da9
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSinkTask.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.kubernetescustomresources;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSinkConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSinkTask;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelKubernetescustomresourcesSinkTask extends CamelSinkTask {
+
+    @Override
+    protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
+            Map<String, String> props) {
+        return new CamelKubernetescustomresourcesSinkConnectorConfig(props);
+    }
+    @Override
+    protected Map<String, String> getDefaultConfig() {
+        return new HashMap<String, String>() {{
+            put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "kubernetes-custom-resources");
+        }};
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceConnector.java b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceConnector.java
new file mode 100644
index 0000000..2efc733
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceConnector.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.kubernetescustomresources;
+
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSourceConnector;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.Task;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelKubernetescustomresourcesSourceConnector
+        extends
+            CamelSourceConnector {
+
+    @Override
+    public ConfigDef config() {
+        return CamelKubernetescustomresourcesSourceConnectorConfig.conf();
+    }
+    @Override
+    public Class<? extends Task> taskClass() {
+        return CamelKubernetescustomresourcesSourceTask.class;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceConnectorConfig.java b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceConnectorConfig.java
new file mode 100644
index 0000000..8f2b656
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceConnectorConfig.java
@@ -0,0 +1,189 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.kubernetescustomresources;
+
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
+import org.apache.kafka.common.config.ConfigDef;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelKubernetescustomresourcesSourceConnectorConfig
+        extends
+            CamelSourceConnectorConfig {
+
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_CONF = "camel.source.path.masterUrl";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DOC = "Kubernetes Master url";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_CONF = "camel.source.endpoint.apiVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DOC = "The Kubernetes API Version to use";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_CONF = "camel.source.endpoint.dnsDomain";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DOC = "The dns domain, used for ServiceCall EIP";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_CONF = "camel.source.endpoint.kubernetesClient";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DOC = "Default KubernetesClient to use if provided";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_CONF = "camel.source.endpoint.portName";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DOC = "The port name, used for ServiceCall EIP";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_CONF = "camel.source.endpoint.portProtocol";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DOC = "The port protocol, used for ServiceCall EIP";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DEFAULT = "tcp";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or E [...]
+    public static final Boolean CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_VERSION_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_KEY_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_VALUE_CONF = "camel.source.endpoint.labelValue";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_VALUE_DOC = "The Consumer Label value when watching at some resources";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_VALUE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_NAMESPACE_CONF = "camel.source.endpoint.namespace";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_NAMESPACE_DOC = "The namespace";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_NAMESPACE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_POOL_SIZE_CONF = "camel.source.endpoint.poolSize";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_POOL_SIZE_DOC = "The Consumer pool size";
+    public static final Integer CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_POOL_SIZE_DEFAULT = 1;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_RESOURCE_NAME_CONF = "camel.source.endpoint.resourceName";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_RESOURCE_NAME_DOC = "The Consumer Resource Name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_RESOURCE_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCEPTION_HANDLER_CONF = "camel.source.endpoint.exceptionHandler";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCEPTION_HANDLER_DOC = "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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCEPTION_HANDLER_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
+    public static final Boolean CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_CONF = "camel.source.endpoint.connectionTimeout";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DOC = "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
+    public static final Boolean CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_CONF = "camel.source.endpoint.caCertData";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DOC = "The CA Cert Data";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_CONF = "camel.source.endpoint.caCertFile";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DOC = "The CA Cert File";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_CONF = "camel.source.endpoint.clientCertData";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DOC = "The Client Cert Data";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_CONF = "camel.source.endpoint.clientCertFile";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DOC = "The Client Cert File";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_CONF = "camel.source.endpoint.clientKeyAlgo";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DOC = "The Key Algorithm used by the client";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_CONF = "camel.source.endpoint.clientKeyData";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DOC = "The Client Key data";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_CONF = "camel.source.endpoint.clientKeyFile";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DOC = "The Client Key file";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_CONF = "camel.source.endpoint.clientKeyPassphrase";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DOC = "The Client Key Passphrase";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_CONF = "camel.source.endpoint.oauthToken";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DOC = "The Auth Token";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_CONF = "camel.source.endpoint.password";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DOC = "Password to connect to Kubernetes";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_CONF = "camel.source.endpoint.trustCerts";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DOC = "Define if the certs we used are trusted anyway or not";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_CONF = "camel.source.endpoint.username";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DOC = "Username to connect to Kubernetes";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.kubernetes-custom-resources.bridgeErrorHandler";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or  [...]
+    public static final Boolean CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.kubernetes-custom-resources.basicPropertyBinding";
+    public static final String CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
+    public static final Boolean CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+
+    public CamelKubernetescustomresourcesSourceConnectorConfig(
+            ConfigDef config,
+            Map<String, String> parsedConfig) {
+        super(config, parsedConfig);
+    }
+
+    public CamelKubernetescustomresourcesSourceConnectorConfig(
+            Map<String, String> parsedConfig) {
+        this(conf(), parsedConfig);
+    }
+
+    public static ConfigDef conf() {
+        ConfigDef conf = new ConfigDef(CamelSourceConnectorConfig.conf());
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_PATH_MASTER_URL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_API_VERSION_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_DNS_DOMAIN_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_KUBERNETES_CLIENT_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PORT_PROTOCOL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CRD_VERSION_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_KEY_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_LABEL_VALUE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_NAMESPACE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_POOL_SIZE_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_POOL_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_POOL_SIZE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_RESOURCE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_RESOURCE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_RESOURCE_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCEPTION_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_EXCHANGE_PATTERN_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CONNECTION_TIMEOUT_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_SYNCHRONOUS_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_DATA_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CA_CERT_FILE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_DATA_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_CERT_FILE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_ALGO_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_DATA_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_FILE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_CLIENT_KEY_PASSPHRASE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_OAUTH_TOKEN_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_PASSWORD_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_TRUST_CERTS_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_ENDPOINT_USERNAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_KUBERNETESCUSTOMRESOURCES_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        return conf;
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceTask.java b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceTask.java
new file mode 100644
index 0000000..f22f7bc
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetescustomresources/CamelKubernetescustomresourcesSourceTask.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.kubernetescustomresources;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.kafkaconnector.CamelSourceConnectorConfig;
+import org.apache.camel.kafkaconnector.CamelSourceTask;
+
+@Generated("This class has been generated by camel-kafka-connector-generator-maven-plugin, remove this annotation to prevent it from being generated.")
+public class CamelKubernetescustomresourcesSourceTask extends CamelSourceTask {
+
+    @Override
+    protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
+            Map<String, String> props) {
+        return new CamelKubernetescustomresourcesSourceConnectorConfig(props);
+    }
+    @Override
+    protected Map<String, String> getDefaultConfig() {
+        return new HashMap<String, String>() {{
+            put(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF, "kubernetes-custom-resources");
+        }};
+    }
+}
\ No newline at end of file
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/resources/META-INF/LICENSE.txt b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/resources/META-INF/NOTICE.txt b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/connectors/camel-kubernetes-custom-resources-kafka-connector/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-source.json b/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-source.json
index 2d6443f..bfb7af9 100644
--- a/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-source.json
+++ b/connectors/camel-kubernetes-deployments-kafka-connector/src/generated/resources/camel-kubernetes-deployments-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-deployments-kafka-connector/src/main/docs/camel-kubernetes-deployments-kafka-source-connector.adoc b/connectors/camel-kubernetes-deployments-kafka-connector/src/main/docs/camel-kubernetes-deployments-kafka-source-connector.adoc
index 50b850b..af44770 100644
--- a/connectors/camel-kubernetes-deployments-kafka-connector/src/main/docs/camel-kubernetes-deployments-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-deployments-kafka-connector/src/main/docs/camel-kubernetes-deployments-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesdeployments.CamelKuber
 ----
 
 
-The camel-kubernetes-deployments source connector supports 31 options, which are listed below.
+The camel-kubernetes-deployments source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-deployments source connector supports 31 options, which are
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-deployments-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesdeployments/CamelKubernetesdeploymentsSourceConnectorConfig.java b/connectors/camel-kubernetes-deployments-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesdeployments/CamelKubernetesdeploymentsSourceConnectorConfig.java
index 7f88fde..11f8530 100644
--- a/connectors/camel-kubernetes-deployments-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesdeployments/CamelKubernetesdeploymentsSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-deployments-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesdeployments/CamelKubernetesdeploymentsSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetesdeploymentsSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetesdeploymentsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESDEPLOYMENTS_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-source.json b/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-source.json
index 0088ab1..d88584c 100644
--- a/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-source.json
+++ b/connectors/camel-kubernetes-hpa-kafka-connector/src/generated/resources/camel-kubernetes-hpa-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-hpa-kafka-connector/src/main/docs/camel-kubernetes-hpa-kafka-source-connector.adoc b/connectors/camel-kubernetes-hpa-kafka-connector/src/main/docs/camel-kubernetes-hpa-kafka-source-connector.adoc
index 41f8af4..7478695 100644
--- a/connectors/camel-kubernetes-hpa-kafka-connector/src/main/docs/camel-kubernetes-hpa-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-hpa-kafka-connector/src/main/docs/camel-kubernetes-hpa-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kuberneteshpa.CamelKuberneteshpa
 ----
 
 
-The camel-kubernetes-hpa source connector supports 31 options, which are listed below.
+The camel-kubernetes-hpa source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-hpa source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-hpa-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kuberneteshpa/CamelKuberneteshpaSourceConnectorConfig.java b/connectors/camel-kubernetes-hpa-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kuberneteshpa/CamelKuberneteshpaSourceConnectorConfig.java
index 350f172..3984aec 100644
--- a/connectors/camel-kubernetes-hpa-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kuberneteshpa/CamelKuberneteshpaSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-hpa-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kuberneteshpa/CamelKuberneteshpaSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKuberneteshpaSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level a [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKuberneteshpaSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESHPA_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-source.json b/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-source.json
index 0de6735..dcea34d 100644
--- a/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-source.json
+++ b/connectors/camel-kubernetes-job-kafka-connector/src/generated/resources/camel-kubernetes-job-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-job-kafka-connector/src/main/docs/camel-kubernetes-job-kafka-source-connector.adoc b/connectors/camel-kubernetes-job-kafka-connector/src/main/docs/camel-kubernetes-job-kafka-source-connector.adoc
index 5567b8e..c004ffe 100644
--- a/connectors/camel-kubernetes-job-kafka-connector/src/main/docs/camel-kubernetes-job-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-job-kafka-connector/src/main/docs/camel-kubernetes-job-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesjob.CamelKubernetesjob
 ----
 
 
-The camel-kubernetes-job source connector supports 31 options, which are listed below.
+The camel-kubernetes-job source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-job source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-job-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesjob/CamelKubernetesjobSourceConnectorConfig.java b/connectors/camel-kubernetes-job-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesjob/CamelKubernetesjobSourceConnectorConfig.java
index cffcfdf..f0ebf5c 100644
--- a/connectors/camel-kubernetes-job-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesjob/CamelKubernetesjobSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-job-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesjob/CamelKubernetesjobSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetesjobSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level a [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetesjobSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESJOB_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-source.json b/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-source.json
index 80f11cd..a38bb65 100644
--- a/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-source.json
+++ b/connectors/camel-kubernetes-namespaces-kafka-connector/src/generated/resources/camel-kubernetes-namespaces-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/docs/camel-kubernetes-namespaces-kafka-source-connector.adoc b/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/docs/camel-kubernetes-namespaces-kafka-source-connector.adoc
index 9f4800f..f91d7d5 100644
--- a/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/docs/camel-kubernetes-namespaces-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/docs/camel-kubernetes-namespaces-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesnamespaces.CamelKubern
 ----
 
 
-The camel-kubernetes-namespaces source connector supports 31 options, which are listed below.
+The camel-kubernetes-namespaces source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-namespaces source connector supports 31 options, which are
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnamespaces/CamelKubernetesnamespacesSourceConnectorConfig.java b/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnamespaces/CamelKubernetesnamespacesSourceConnectorConfig.java
index 675e91c..9acdb73 100644
--- a/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnamespaces/CamelKubernetesnamespacesSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-namespaces-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnamespaces/CamelKubernetesnamespacesSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetesnamespacesSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR  [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetesnamespacesSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNAMESPACES_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-source.json b/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-source.json
index 6cafbfe..320bb79 100644
--- a/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-source.json
+++ b/connectors/camel-kubernetes-nodes-kafka-connector/src/generated/resources/camel-kubernetes-nodes-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-nodes-kafka-connector/src/main/docs/camel-kubernetes-nodes-kafka-source-connector.adoc b/connectors/camel-kubernetes-nodes-kafka-connector/src/main/docs/camel-kubernetes-nodes-kafka-source-connector.adoc
index 0142cb6..f894c79 100644
--- a/connectors/camel-kubernetes-nodes-kafka-connector/src/main/docs/camel-kubernetes-nodes-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-nodes-kafka-connector/src/main/docs/camel-kubernetes-nodes-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesnodes.CamelKubernetesn
 ----
 
 
-The camel-kubernetes-nodes source connector supports 31 options, which are listed below.
+The camel-kubernetes-nodes source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-nodes source connector supports 31 options, which are liste
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-nodes-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnodes/CamelKubernetesnodesSourceConnectorConfig.java b/connectors/camel-kubernetes-nodes-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnodes/CamelKubernetesnodesSourceConnectorConfig.java
index 1c92564..ed270b7 100644
--- a/connectors/camel-kubernetes-nodes-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnodes/CamelKubernetesnodesSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-nodes-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesnodes/CamelKubernetesnodesSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetesnodesSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetesnodesSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESNODES_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-source.json b/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-source.json
index 983d302..1679e6e 100644
--- a/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-source.json
+++ b/connectors/camel-kubernetes-pods-kafka-connector/src/generated/resources/camel-kubernetes-pods-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc b/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
index 8268d5a..0144dfe 100644
--- a/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetespods.CamelKubernetespo
 ----
 
 
-The camel-kubernetes-pods source connector supports 31 options, which are listed below.
+The camel-kubernetes-pods source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-pods source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-pods-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetespods/CamelKubernetespodsSourceConnectorConfig.java b/connectors/camel-kubernetes-pods-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetespods/CamelKubernetespodsSourceConnectorConfig.java
index 125bbc0..925cb9b 100644
--- a/connectors/camel-kubernetes-pods-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetespods/CamelKubernetespodsSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-pods-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetespods/CamelKubernetespodsSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetespodsSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level  [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetespodsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESPODS_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-source.json b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-source.json
index 878a9ca..693f9c0 100644
--- a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-source.json
+++ b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/generated/resources/camel-kubernetes-replication-controllers-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/docs/camel-kubernetes-replication-controllers-kafka-source-connector.adoc b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/docs/camel-kubernetes-replication-controllers-kafka-source-connector.adoc
index 9558c33..d02bebb 100644
--- a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/docs/camel-kubernetes-replication-controllers-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/docs/camel-kubernetes-replication-controllers-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesreplicationcontrollers
 ----
 
 
-The camel-kubernetes-replication-controllers source connector supports 31 options, which are listed below.
+The camel-kubernetes-replication-controllers source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-replication-controllers source connector supports 31 option
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesreplicationcontrollers/CamelKubernetesreplicationcontrollersSourceConnectorConfig.java b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesreplicationcontrollers/CamelKubernetesreplicationcontrollersSourceConnectorConfig.java
index b365833..c8ec87d 100644
--- a/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesreplicationcontrollers/CamelKubernetesreplicationcontrollersSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-replication-controllers-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesreplicationcontrollers/CamelKubernetesreplicationcontrollersSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetesreplicationcontrollersSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WA [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetesreplicationcontrollersSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESREPLICATIONCONTROLLERS_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-source.json b/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-source.json
index c889b93..0151fa7 100644
--- a/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-source.json
+++ b/connectors/camel-kubernetes-services-kafka-connector/src/generated/resources/camel-kubernetes-services-source.json
@@ -53,6 +53,36 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.labelKey": {
 			"name": "camel.source.endpoint.labelKey",
 			"description": "The Consumer Label key when watching at some resources",
diff --git a/connectors/camel-kubernetes-services-kafka-connector/src/main/docs/camel-kubernetes-services-kafka-source-connector.adoc b/connectors/camel-kubernetes-services-kafka-connector/src/main/docs/camel-kubernetes-services-kafka-source-connector.adoc
index cb22eb5..9959302 100644
--- a/connectors/camel-kubernetes-services-kafka-connector/src/main/docs/camel-kubernetes-services-kafka-source-connector.adoc
+++ b/connectors/camel-kubernetes-services-kafka-connector/src/main/docs/camel-kubernetes-services-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesservices.CamelKubernet
 ----
 
 
-The camel-kubernetes-services source connector supports 31 options, which are listed below.
+The camel-kubernetes-services source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-services source connector supports 31 options, which are li
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/connectors/camel-kubernetes-services-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesservices/CamelKubernetesservicesSourceConnectorConfig.java b/connectors/camel-kubernetes-services-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesservices/CamelKubernetesservicesSourceConnectorConfig.java
index 1dd50ea..113d14d 100644
--- a/connectors/camel-kubernetes-services-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesservices/CamelKubernetesservicesSourceConnectorConfig.java
+++ b/connectors/camel-kubernetes-services-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/kubernetesservices/CamelKubernetesservicesSourceConnectorConfig.java
@@ -47,6 +47,21 @@ public class CamelKubernetesservicesSourceConnectorConfig
     public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF = "camel.source.endpoint.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR le [...]
     public static final Boolean CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_GROUP_CONF = "camel.source.endpoint.crdGroup";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_GROUP_DOC = "The Consumer CRD Resource Group we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_GROUP_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_NAME_CONF = "camel.source.endpoint.crdName";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_NAME_DOC = "The Consumer CRD Resource name we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_NAME_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_PLURAL_CONF = "camel.source.endpoint.crdPlural";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_PLURAL_DOC = "The Consumer CRD Resource Plural we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_PLURAL_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_SCOPE_CONF = "camel.source.endpoint.crdScope";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_SCOPE_DOC = "The Consumer CRD Resource Scope we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_SCOPE_DEFAULT = null;
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_VERSION_CONF = "camel.source.endpoint.crdVersion";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_VERSION_DOC = "The Consumer CRD Resource Version we would like to watch";
+    public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_VERSION_DEFAULT = null;
     public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_KEY_CONF = "camel.source.endpoint.labelKey";
     public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_KEY_DOC = "The Consumer Label key when watching at some resources";
     public static final String CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_KEY_DEFAULT = null;
@@ -140,6 +155,11 @@ public class CamelKubernetesservicesSourceConnectorConfig
         conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_PORT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_PORT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_PORT_NAME_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_PORT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_PORT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_PORT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_GROUP_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_NAME_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_PLURAL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_PLURAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_PLURAL_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_SCOPE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_SCOPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_SCOPE_DOC);
+        conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_CRD_VERSION_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_KEY_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_LABEL_VALUE_DOC);
         conf.define(CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_NAMESPACE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_KUBERNETESSERVICES_ENDPOINT_NAMESPACE_DOC);
diff --git a/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-source.json b/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-source.json
index e6e4bbc..36414b3 100644
--- a/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-source.json
+++ b/connectors/camel-pulsar-kafka-connector/src/generated/resources/camel-pulsar-source.json
@@ -108,6 +108,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.readCompacted": {
+			"name": "camel.source.endpoint.readCompacted",
+			"description": "Enable compacted topic reading.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.subscriptionInitialPosition": {
 			"name": "camel.source.endpoint.subscriptionInitialPosition",
 			"description": "Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST]",
@@ -250,6 +257,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.pulsar.readCompacted": {
+			"name": "camel.component.pulsar.readCompacted",
+			"description": "Enable compacted topic reading.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.pulsar.subscriptionInitialPosition": {
 			"name": "camel.component.pulsar.subscriptionInitialPosition",
 			"description": "Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST]",
diff --git a/connectors/camel-pulsar-kafka-connector/src/main/docs/camel-pulsar-kafka-source-connector.adoc b/connectors/camel-pulsar-kafka-connector/src/main/docs/camel-pulsar-kafka-source-connector.adoc
index 61f835b..ac577d8 100644
--- a/connectors/camel-pulsar-kafka-connector/src/main/docs/camel-pulsar-kafka-source-connector.adoc
+++ b/connectors/camel-pulsar-kafka-connector/src/main/docs/camel-pulsar-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.pulsar.CamelPulsarSourceConnecto
 ----
 
 
-The camel-pulsar source connector supports 45 options, which are listed below.
+The camel-pulsar source connector supports 47 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The camel-pulsar source connector supports 45 options, which are listed below.
 | *camel.source.endpoint.maxRedeliverCount* | Maximum number of times that a message will be redelivered before being sent to the dead letter queue. If this value is not set, no Dead Letter Policy will be created | null | false | MEDIUM
 | *camel.source.endpoint.negativeAckRedeliveryDelay Micros* | Set the negative acknowledgement delay | 60000000L | false | MEDIUM
 | *camel.source.endpoint.numberOfConsumers* | Number of consumers - defaults to 1 | 1 | false | MEDIUM
+| *camel.source.endpoint.readCompacted* | Enable compacted topic reading. | false | false | MEDIUM
 | *camel.source.endpoint.subscriptionInitialPosition* | Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST] | "LATEST" | false | MEDIUM
 | *camel.source.endpoint.subscriptionName* | Name of the subscription to use | "subs" | false | MEDIUM
 | *camel.source.endpoint.subscriptionTopicsMode* | Determines to which topics this consumer should be subscribed to - Persistent, Non-Persistent, or both. Only used with pattern subscriptions. One of: [PersistentOnly] [NonPersistentOnly] [AllTopics] | "PersistentOnly" | false | MEDIUM
@@ -65,6 +66,7 @@ The camel-pulsar source connector supports 45 options, which are listed below.
 | *camel.component.pulsar.maxRedeliverCount* | Maximum number of times that a message will be redelivered before being sent to the dead letter queue. If this value is not set, no Dead Letter Policy will be created | null | false | MEDIUM
 | *camel.component.pulsar.negativeAckRedeliveryDelay Micros* | Set the negative acknowledgement delay | 60000000L | false | MEDIUM
 | *camel.component.pulsar.numberOfConsumers* | Number of consumers - defaults to 1 | 1 | false | MEDIUM
+| *camel.component.pulsar.readCompacted* | Enable compacted topic reading. | false | false | MEDIUM
 | *camel.component.pulsar.subscriptionInitialPosition* | Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST] | "LATEST" | false | MEDIUM
 | *camel.component.pulsar.subscriptionName* | Name of the subscription to use | "subs" | false | MEDIUM
 | *camel.component.pulsar.subscriptionTopicsMode* | Determines to which topics this consumer should be subscribed to - Persistent, Non-Persistent, or both. Only used with pattern subscriptions. One of: [PersistentOnly] [NonPersistentOnly] [AllTopics] | "PersistentOnly" | false | MEDIUM
diff --git a/connectors/camel-pulsar-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/pulsar/CamelPulsarSourceConnectorConfig.java b/connectors/camel-pulsar-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/pulsar/CamelPulsarSourceConnectorConfig.java
index 899cbc4..b44b964 100644
--- a/connectors/camel-pulsar-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/pulsar/CamelPulsarSourceConnectorConfig.java
+++ b/connectors/camel-pulsar-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/pulsar/CamelPulsarSourceConnectorConfig.java
@@ -71,6 +71,9 @@ public class CamelPulsarSourceConnectorConfig
     public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_NUMBER_OF_CONSUMERS_CONF = "camel.source.endpoint.numberOfConsumers";
     public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_NUMBER_OF_CONSUMERS_DOC = "Number of consumers - defaults to 1";
     public static final Integer CAMEL_SOURCE_PULSAR_ENDPOINT_NUMBER_OF_CONSUMERS_DEFAULT = 1;
+    public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_READ_COMPACTED_CONF = "camel.source.endpoint.readCompacted";
+    public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_READ_COMPACTED_DOC = "Enable compacted topic reading.";
+    public static final Boolean CAMEL_SOURCE_PULSAR_ENDPOINT_READ_COMPACTED_DEFAULT = false;
     public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_INITIAL_POSITION_CONF = "camel.source.endpoint.subscriptionInitialPosition";
     public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_INITIAL_POSITION_DOC = "Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST]";
     public static final String CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_INITIAL_POSITION_DEFAULT = "LATEST";
@@ -134,6 +137,9 @@ public class CamelPulsarSourceConnectorConfig
     public static final String CAMEL_SOURCE_PULSAR_COMPONENT_NUMBER_OF_CONSUMERS_CONF = "camel.component.pulsar.numberOfConsumers";
     public static final String CAMEL_SOURCE_PULSAR_COMPONENT_NUMBER_OF_CONSUMERS_DOC = "Number of consumers - defaults to 1";
     public static final Integer CAMEL_SOURCE_PULSAR_COMPONENT_NUMBER_OF_CONSUMERS_DEFAULT = 1;
+    public static final String CAMEL_SOURCE_PULSAR_COMPONENT_READ_COMPACTED_CONF = "camel.component.pulsar.readCompacted";
+    public static final String CAMEL_SOURCE_PULSAR_COMPONENT_READ_COMPACTED_DOC = "Enable compacted topic reading.";
+    public static final Boolean CAMEL_SOURCE_PULSAR_COMPONENT_READ_COMPACTED_DEFAULT = false;
     public static final String CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_INITIAL_POSITION_CONF = "camel.component.pulsar.subscriptionInitialPosition";
     public static final String CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_INITIAL_POSITION_DOC = "Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST]";
     public static final String CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_INITIAL_POSITION_DEFAULT = "LATEST";
@@ -189,6 +195,7 @@ public class CamelPulsarSourceConnectorConfig
         conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_MAX_REDELIVER_COUNT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_ENDPOINT_MAX_REDELIVER_COUNT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_MAX_REDELIVER_COUNT_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_NEGATIVE_ACK_REDELIVERY_DELAY_MICROS_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_PULSAR_ENDPOINT_NEGATIVE_ACK_REDELIVERY_DELAY_MICROS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_NEGATIVE_ACK_REDELIVERY_DELAY_MICROS_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_NUMBER_OF_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_PULSAR_ENDPOINT_NUMBER_OF_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_NUMBER_OF_CONSUMERS_DOC);
+        conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_READ_COMPACTED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_PULSAR_ENDPOINT_READ_COMPACTED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_READ_COMPACTED_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_INITIAL_POSITION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_INITIAL_POSITION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_INITIAL_POSITION_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_NAME_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_TOPICS_MODE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_TOPICS_MODE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_ENDPOINT_SUBSCRIPTION_TOPICS_MODE_DOC);
@@ -210,6 +217,7 @@ public class CamelPulsarSourceConnectorConfig
         conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_MAX_REDELIVER_COUNT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_COMPONENT_MAX_REDELIVER_COUNT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_MAX_REDELIVER_COUNT_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_NEGATIVE_ACK_REDELIVERY_DELAY_MICROS_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_PULSAR_COMPONENT_NEGATIVE_ACK_REDELIVERY_DELAY_MICROS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_NEGATIVE_ACK_REDELIVERY_DELAY_MICROS_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_NUMBER_OF_CONSUMERS_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_PULSAR_COMPONENT_NUMBER_OF_CONSUMERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_NUMBER_OF_CONSUMERS_DOC);
+        conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_READ_COMPACTED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_PULSAR_COMPONENT_READ_COMPACTED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_READ_COMPACTED_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_INITIAL_POSITION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_INITIAL_POSITION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_INITIAL_POSITION_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_NAME_DOC);
         conf.define(CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_TOPICS_MODE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_TOPICS_MODE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_PULSAR_COMPONENT_SUBSCRIPTION_TOPICS_MODE_DOC);
diff --git a/connectors/camel-vertx-websocket-kafka-connector/src/generated/resources/camel-vertx-websocket-sink.json b/connectors/camel-vertx-websocket-kafka-connector/src/generated/resources/camel-vertx-websocket-sink.json
index 4653fa2..e1bc267 100644
--- a/connectors/camel-vertx-websocket-kafka-connector/src/generated/resources/camel-vertx-websocket-sink.json
+++ b/connectors/camel-vertx-websocket-kafka-connector/src/generated/resources/camel-vertx-websocket-sink.json
@@ -36,6 +36,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.clientSubProtocols": {
+			"name": "camel.sink.endpoint.clientSubProtocols",
+			"description": "Comma separated list of WebSocket subprotocols that the client should use for the Sec-WebSocket-Protocol header",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
diff --git a/connectors/camel-vertx-websocket-kafka-connector/src/main/docs/camel-vertx-websocket-kafka-sink-connector.adoc b/connectors/camel-vertx-websocket-kafka-connector/src/main/docs/camel-vertx-websocket-kafka-sink-connector.adoc
index 95cc27e..de18bdb 100644
--- a/connectors/camel-vertx-websocket-kafka-connector/src/main/docs/camel-vertx-websocket-kafka-sink-connector.adoc
+++ b/connectors/camel-vertx-websocket-kafka-connector/src/main/docs/camel-vertx-websocket-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.vertxwebsocket.CamelVertxwebsock
 ----
 
 
-The camel-vertx-websocket sink connector supports 15 options, which are listed below.
+The camel-vertx-websocket sink connector supports 16 options, which are listed below.
 
 
 
@@ -33,6 +33,7 @@ The camel-vertx-websocket sink connector supports 15 options, which are listed b
 | *camel.sink.path.port* | The port that the consumer should bind to or port of the remote websocket destination that the producer should connect to | 0 | false | MEDIUM
 | *camel.sink.path.path* | The path that the consumer should bind to or path of the remote websocket destination that the producer should connect to | "/" | true | HIGH
 | *camel.sink.endpoint.clientOptions* | Sets customized options for configuring the WebSocket client used in the producer | null | false | MEDIUM
+| *camel.sink.endpoint.clientSubProtocols* | Comma separated list of WebSocket subprotocols that the client should use for the Sec-WebSocket-Protocol header | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.sendToAll* | To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the VertxWebsocketConstants.SEND_TO_ALL header on the message. | false | false | MEDIUM
 | *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
diff --git a/connectors/camel-vertx-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxwebsocket/CamelVertxwebsocketSinkConnectorConfig.java b/connectors/camel-vertx-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxwebsocket/CamelVertxwebsocketSinkConnectorConfig.java
index 3298d8e..08d80d6 100644
--- a/connectors/camel-vertx-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxwebsocket/CamelVertxwebsocketSinkConnectorConfig.java
+++ b/connectors/camel-vertx-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/vertxwebsocket/CamelVertxwebsocketSinkConnectorConfig.java
@@ -38,6 +38,9 @@ public class CamelVertxwebsocketSinkConnectorConfig
     public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_OPTIONS_CONF = "camel.sink.endpoint.clientOptions";
     public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_OPTIONS_DOC = "Sets customized options for configuring the WebSocket client used in the producer";
     public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_OPTIONS_DEFAULT = null;
+    public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_SUB_PROTOCOLS_CONF = "camel.sink.endpoint.clientSubProtocols";
+    public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_SUB_PROTOCOLS_DOC = "Comma separated list of WebSocket subprotocols that the client should use for the Sec-WebSocket-Protocol header";
+    public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_SUB_PROTOCOLS_DEFAULT = null;
     public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware  [...]
     public static final Boolean CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
@@ -89,6 +92,7 @@ public class CamelVertxwebsocketSinkConnectorConfig
         conf.define(CAMEL_SINK_VERTXWEBSOCKET_PATH_PORT_CONF, ConfigDef.Type.INT, CAMEL_SINK_VERTXWEBSOCKET_PATH_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXWEBSOCKET_PATH_PORT_DOC);
         conf.define(CAMEL_SINK_VERTXWEBSOCKET_PATH_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_VERTXWEBSOCKET_PATH_PATH_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_VERTXWEBSOCKET_PATH_PATH_DOC);
         conf.define(CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_OPTIONS_DOC);
+        conf.define(CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_SUB_PROTOCOLS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_SUB_PROTOCOLS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_CLIENT_SUB_PROTOCOLS_DOC);
         conf.define(CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_SEND_TO_ALL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_SEND_TO_ALL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_SEND_TO_ALL_DOC);
         conf.define(CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_VERTXWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
diff --git a/connectors/pom.xml b/connectors/pom.xml
index cd26555..50bc535 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -202,6 +202,7 @@
         <module>camel-arangodb-kafka-connector</module>
         <module>camel-as2-kafka-connector</module>
         <module>camel-asterisk-kafka-connector</module>
+        <module>camel-atlasmap-kafka-connector</module>
         <module>camel-atmos-kafka-connector</module>
         <module>camel-atmosphere-websocket-kafka-connector</module>
         <module>camel-atom-kafka-connector</module>
@@ -386,6 +387,7 @@
         <module>camel-jt400-kafka-connector</module>
         <module>camel-kafka-kafka-connector</module>
         <module>camel-kubernetes-config-maps-kafka-connector</module>
+        <module>camel-kubernetes-custom-resources-kafka-connector</module>
         <module>camel-kubernetes-deployments-kafka-connector</module>
         <module>camel-kubernetes-hpa-kafka-connector</module>
         <module>camel-kubernetes-job-kafka-connector</module>
diff --git a/docs/modules/ROOT/pages/connectors/camel-atlasmap-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-atlasmap-kafka-sink-connector.adoc
new file mode 100644
index 0000000..72187e3
--- /dev/null
+++ b/docs/modules/ROOT/pages/connectors/camel-atlasmap-kafka-sink-connector.adoc
@@ -0,0 +1,66 @@
+// kafka-connector options: START
+[[camel-atlasmap-kafka-connector-sink]]
+= camel-atlasmap-kafka-connector sink configuration
+
+When using camel-atlasmap-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-atlasmap-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.atlasmap.CamelAtlasmapSinkConnector
+----
+
+
+The camel-atlasmap sink connector supports 13 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.resourceUri* | Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod. | null | true | HIGH
+| *camel.sink.endpoint.allowContextMapAll* | Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API. | false | false | MEDIUM
+| *camel.sink.endpoint.contentCache* | Sets whether to use resource content cache or not | false | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
+| *camel.sink.endpoint.sourceMapName* | The Exchange property name for a source message map which hold java.util.Map&lt;String, Message&gt; where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source properties where the scope equals to Document ID. | null | false | MEDIUM
+| *camel.sink.endpoint.targetMapMode* | TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores them into a java.util.Map, and the java.util.Map is set to an exchange property if 'targetMapName' is specified, otherwise message body. 'MESSAGE_HEADER': Stores them into message headers. 'EXCHANGE_PROPERTY': Stores them into exchange properties. ) One of: [MAP] [MESSAGE_HEADER] [EXCHANGE_PROPERTY] | "MAP" | false | MEDIUM
+| *camel.sink.endpoint.targetMapName* | The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map. | null | false | MEDIUM
+| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
+| *camel.sink.endpoint.propertiesFile* | The URI of the properties file which is used for AtlasContextFactory initialization. | null | false | MEDIUM
+| *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
+| *camel.component.atlasmap.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
+| *camel.component.atlasmap.atlasContextFactory* | To use the AtlasContextFactory otherwise a new engine is created. | null | false | MEDIUM
+| *camel.component.atlasmap.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+|===
+
+
+
+The camel-atlasmap sink connector has no converters out of the box.
+
+
+
+
+
+The camel-atlasmap sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-atlasmap sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc
index c440385..6ef24fb 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSinkConnecto
 ----
 
 
-The camel-aws2-sqs sink connector supports 56 options, which are listed below.
+The camel-aws2-sqs sink connector supports 58 options, which are listed below.
 
 
 
@@ -40,6 +40,7 @@ The camel-aws2-sqs sink connector supports 56 options, which are listed below.
 | *camel.sink.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.sink.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.sink.endpoint.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
@@ -68,6 +69,7 @@ The camel-aws2-sqs sink connector supports 56 options, which are listed below.
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sqs.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.delaySeconds* | Delay sending messages for a number of seconds. | null | false | MEDIUM
 | *camel.component.aws2-sqs.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.aws2-sqs.messageDeduplicationId Strategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc
index 88d9b18..8556305 100644
--- a/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-aws2-sqs-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2sqs.CamelAws2sqsSourceConnec
 ----
 
 
-The camel-aws2-sqs source connector supports 91 options, which are listed below.
+The camel-aws2-sqs source connector supports 93 options, which are listed below.
 
 
 
@@ -40,6 +40,7 @@ The camel-aws2-sqs source connector supports 91 options, which are listed below.
 | *camel.source.endpoint.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.source.endpoint.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.source.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.source.endpoint.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.source.endpoint.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
@@ -95,6 +96,7 @@ The camel-aws2-sqs source connector supports 91 options, which are listed below.
 | *camel.component.aws2-sqs.queueOwnerAWSAccountId* | Specify the queue owner aws account id when you need to connect the queue with different account owner. | null | false | MEDIUM
 | *camel.component.aws2-sqs.region* | The region in which SQS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws2-sqs.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
+| *camel.component.aws2-sqs.useIAMCredentials* | Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in. | false | false | MEDIUM
 | *camel.component.aws2-sqs.attributeNames* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. | null | false | MEDIUM
 | *camel.component.aws2-sqs.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.component.aws2-sqs.concurrentConsumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-sink-connector.adoc
index eb964c1..7ccac04 100644
--- a/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.azurestorageblob.CamelAzurestora
 ----
 
 
-The camel-azure-storage-blob sink connector supports 55 options, which are listed below.
+The camel-azure-storage-blob sink connector supports 57 options, which are listed below.
 
 
 
@@ -43,6 +43,7 @@ The camel-azure-storage-blob sink connector supports 55 options, which are liste
 | *camel.sink.endpoint.maxResultsPerPage* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.sink.endpoint.maxRetryRequests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.sink.endpoint.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.sink.endpoint.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.sink.endpoint.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations [...]
 | *camel.sink.endpoint.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.sink.endpoint.blobSequenceNumber* | A user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 263 - 1.The default value is 0. | "0" | false | MEDIUM
@@ -70,6 +71,7 @@ The camel-azure-storage-blob sink connector supports 55 options, which are liste
 | *camel.component.azure-storage-blob.maxResultsPer Page* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.maxRetry Requests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.component.azure-storage-blob.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.component.azure-storage-blob.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), [...]
 | *camel.component.azure-storage-blob.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.blobSequence Number* | A user-controlled value that you can use to track requests. The value of the sequence number must be between 0 and 263 - 1.The default value is 0. | "0" | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-source-connector.adoc
index 1d42bda..aa2e872 100644
--- a/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-azure-storage-blob-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.azurestorageblob.CamelAzurestora
 ----
 
 
-The camel-azure-storage-blob source connector supports 39 options, which are listed below.
+The camel-azure-storage-blob source connector supports 41 options, which are listed below.
 
 
 
@@ -43,6 +43,7 @@ The camel-azure-storage-blob source connector supports 39 options, which are lis
 | *camel.source.endpoint.maxResultsPerPage* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.source.endpoint.maxRetryRequests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.source.endpoint.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.source.endpoint.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.source.endpoint.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operatio [...]
 | *camel.source.endpoint.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
@@ -63,6 +64,7 @@ The camel-azure-storage-blob source connector supports 39 options, which are lis
 | *camel.component.azure-storage-blob.maxResultsPer Page* | Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify maxResultsPerPage or specifies a value greater than 5,000, the server will return up to 5,000 items. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.maxRetry Requests* | Specifies the maximum number of additional HTTP Get requests that will be made while reading the data from a response body. | 0 | false | MEDIUM
 | *camel.component.azure-storage-blob.prefix* | Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs. | null | false | MEDIUM
+| *camel.component.azure-storage-blob.regex* | Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.serviceClient* | Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), [...]
 | *camel.component.azure-storage-blob.timeout* | An optional timeout value beyond which a RuntimeException will be raised. | null | false | MEDIUM
 | *camel.component.azure-storage-blob.bridgeError Handler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-sink-connector.adoc
index ae2f60d..25299ae 100644
--- a/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-sink-connector.adoc
@@ -32,7 +32,7 @@ The camel-couchbase sink connector supports 23 options, which are listed below.
 | *camel.sink.path.protocol* | The protocol to use | null | true | HIGH
 | *camel.sink.path.hostname* | The hostname to use | null | true | HIGH
 | *camel.sink.path.port* | The port number to use | 8091 | false | MEDIUM
-| *camel.sink.endpoint.bucket* | The bucket to use | null | false | MEDIUM
+| *camel.sink.endpoint.bucket* | The bucket to use | null | true | HIGH
 | *camel.sink.endpoint.collection* | The collection to use | null | false | MEDIUM
 | *camel.sink.endpoint.key* | The key to use | null | false | MEDIUM
 | *camel.sink.endpoint.scope* | The scope to use | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-source-connector.adoc
index 474abfc..3d6f169 100644
--- a/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-couchbase-kafka-source-connector.adoc
@@ -32,7 +32,7 @@ The camel-couchbase source connector supports 42 options, which are listed below
 | *camel.source.path.protocol* | The protocol to use | null | true | HIGH
 | *camel.source.path.hostname* | The hostname to use | null | true | HIGH
 | *camel.source.path.port* | The port number to use | 8091 | false | MEDIUM
-| *camel.source.endpoint.bucket* | The bucket to use | null | false | MEDIUM
+| *camel.source.endpoint.bucket* | The bucket to use | null | true | HIGH
 | *camel.source.endpoint.collection* | The collection to use | null | false | MEDIUM
 | *camel.source.endpoint.key* | The key to use | null | false | MEDIUM
 | *camel.source.endpoint.scope* | The scope to use | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-git-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-git-kafka-sink-connector.adoc
index 11b02be..ba7d35c 100644
--- a/docs/modules/ROOT/pages/connectors/camel-git-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-git-kafka-sink-connector.adoc
@@ -31,14 +31,14 @@ The camel-git sink connector supports 14 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.localPath* | Local repository path | null | true | HIGH
 | *camel.sink.endpoint.branchName* | The branch name to work on | null | false | MEDIUM
+| *camel.sink.endpoint.allowEmpty* | The flag to manage empty git commits | true | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
+| *camel.sink.endpoint.operation* | The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList] | null | false | MEDIUM
 | *camel.sink.endpoint.password* | Remote repository password | null | false | MEDIUM
 | *camel.sink.endpoint.remoteName* | The remote repository name to use in particular operation like pull | null | false | MEDIUM
 | *camel.sink.endpoint.remotePath* | The remote repository path | null | false | MEDIUM
 | *camel.sink.endpoint.tagName* | The tag name to work on | null | false | MEDIUM
 | *camel.sink.endpoint.username* | Remote repository username | null | false | MEDIUM
-| *camel.sink.endpoint.allowEmpty* | The flag to manage empty git commits | true | false | MEDIUM
-| *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.operation* | The operation to do on the repository One of: [clone] [init] [add] [remove] [commit] [commitAll] [createBranch] [deleteBranch] [createTag] [deleteTag] [status] [log] [push] [pull] [showBranches] [cherryPick] [remoteAdd] [remoteList] | null | false | MEDIUM
 | *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.git.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
diff --git a/docs/modules/ROOT/pages/connectors/camel-git-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-git-kafka-source-connector.adoc
index 8d96def..f3f93a9 100644
--- a/docs/modules/ROOT/pages/connectors/camel-git-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-git-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.git.CamelGitSourceConnector
 ----
 
 
-The camel-git source connector supports 15 options, which are listed below.
+The camel-git source connector supports 10 options, which are listed below.
 
 
 
@@ -31,11 +31,6 @@ The camel-git source connector supports 15 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.source.path.localPath* | Local repository path | null | true | HIGH
 | *camel.source.endpoint.branchName* | The branch name to work on | null | false | MEDIUM
-| *camel.source.endpoint.password* | Remote repository password | null | false | MEDIUM
-| *camel.source.endpoint.remoteName* | The remote repository name to use in particular operation like pull | null | false | MEDIUM
-| *camel.source.endpoint.remotePath* | The remote repository path | null | false | MEDIUM
-| *camel.source.endpoint.tagName* | The tag name to work on | null | false | MEDIUM
-| *camel.source.endpoint.username* | Remote repository username | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.type* | The consumer type One of: [commit] [tag] [branch] | null | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-sink-connector.adoc
index 71c1ddf..60d52b1 100644
--- a/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.grpc.CamelGrpcSinkConnector
 ----
 
 
-The camel-grpc sink connector supports 25 options, which are listed below.
+The camel-grpc sink connector supports 26 options, which are listed below.
 
 
 
@@ -32,6 +32,7 @@ The camel-grpc sink connector supports 25 options, which are listed below.
 | *camel.sink.path.host* | The gRPC server host name. This is localhost or 0.0.0.0 when being a consumer or remote server host name when using producer. | null | true | HIGH
 | *camel.sink.path.port* | The gRPC local or remote server port | null | true | HIGH
 | *camel.sink.path.service* | Fully qualified service name from the protocol buffer descriptor file (package dot service definition name) | null | true | HIGH
+| *camel.sink.endpoint.autoDiscoverClientInterceptors* | Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.sink.endpoint.flowControlWindow* | The HTTP/2 flow control window size (MiB) | 1048576 | false | MEDIUM
 | *camel.sink.endpoint.maxMessageSize* | The maximum message size allowed to be received/sent (MiB) | 4194304 | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
diff --git a/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-source-connector.adoc
index 773f507..2e3b58b 100644
--- a/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-grpc-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.grpc.CamelGrpcSourceConnector
 ----
 
 
-The camel-grpc source connector supports 27 options, which are listed below.
+The camel-grpc source connector supports 29 options, which are listed below.
 
 
 
@@ -32,6 +32,7 @@ The camel-grpc source connector supports 27 options, which are listed below.
 | *camel.source.path.host* | The gRPC server host name. This is localhost or 0.0.0.0 when being a consumer or remote server host name when using producer. | null | true | HIGH
 | *camel.source.path.port* | The gRPC local or remote server port | null | true | HIGH
 | *camel.source.path.service* | Fully qualified service name from the protocol buffer descriptor file (package dot service definition name) | null | true | HIGH
+| *camel.source.endpoint.autoDiscoverClient Interceptors* | Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.source.endpoint.flowControlWindow* | The HTTP/2 flow control window size (MiB) | 1048576 | false | MEDIUM
 | *camel.source.endpoint.maxMessageSize* | The maximum message size allowed to be received/sent (MiB) | 4194304 | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
@@ -39,6 +40,7 @@ The camel-grpc source connector supports 27 options, which are listed below.
 | *camel.source.endpoint.forwardOnCompleted* | Determines if onCompleted events should be pushed to the Camel route. | false | false | MEDIUM
 | *camel.source.endpoint.forwardOnError* | Determines if onError events should be pushed to the Camel route. Exceptions will be set as message body. | false | false | MEDIUM
 | *camel.source.endpoint.maxConcurrentCallsPer Connection* | The maximum number of concurrent calls permitted for each incoming server connection | 2147483647 | false | MEDIUM
+| *camel.source.endpoint.routeControlledStream Observer* | Lets the route to take control over stream observer. If this value is set to true, then the response observer of gRPC call will be set with the name GrpcConstants.GRPC_RESPONSE_OBSERVER in the Exchange object. Please note that the stream observer's onNext(), onError(), onCompleted() methods should be called in the route. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-sink-connector.adoc
index b82f46e..375d202 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-sink-connector.adoc
@@ -40,9 +40,9 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.sink.endpoint.compressionCodec* | This parameter allows you to specify the compression codec for all data generated by this producer. Valid values are none, gzip and snappy. One of: [none] [gzip] [snappy] [lz4] | "none" | false | MEDIUM
 | *camel.sink.endpoint.connectionMaxIdleMs* | Close idle connections after the number of milliseconds specified by this config. | "540000" | false | MEDIUM
 | *camel.sink.endpoint.enableIdempotence* | If set to 'true' the producer will ensure that exactly one copy of each message is written in the stream. If 'false', producer retries may write duplicates of the retried message in the stream. If set to true this option will require max.in.flight.requests.per.connection to be set to 1 and retries cannot be zero and additionally acks must be set to 'all'. | false | false | MEDIUM
-| *camel.sink.endpoint.kafkaHeaderSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
+| *camel.sink.endpoint.headerSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
 | *camel.sink.endpoint.key* | The record key (or null if no key is specified). If this option has been configured then it take precedence over header KafkaConstants#KEY | null | false | MEDIUM
-| *camel.sink.endpoint.keySerializerClass* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.sink.endpoint.keySerializer* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.lingerMs* | The producer groups together any records that arrive in between request transmissions into a single batched request. Normally this occurs only under load when records arrive faster than they can be sent out. However in some circumstances the client may want to reduce the number of requests even under moderate load. This setting accomplishes this by adding a small amount of artificial delay that is, rather than immediately sending out a record the produc [...]
 | *camel.sink.endpoint.maxBlockMs* | The configuration controls how long sending to kafka will block. These methods can be blocked for multiple reasons. For e.g: buffer full, metadata unavailable.This configuration imposes maximum limit on the total time spent in fetching metadata, serialization of key and value, partitioning and allocation of buffer memory when doing a send(). In case of partitionsFor(), this configuration imposes a maximum time threshold on waiting for metadata | "6000 [...]
@@ -64,7 +64,7 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.sink.endpoint.retries* | Setting a value greater than zero will cause the client to resend any record whose send fails with a potentially transient error. Note that this retry is no different than if the client resent the record upon receiving the error. Allowing retries will potentially change the ordering of records because if two records are sent to a single partition, and the first fails and is retried but the second succeeds, then the second record may appear first. | "0" | [...]
 | *camel.sink.endpoint.retryBackoffMs* | Before each retry, the producer refreshes the metadata of relevant topics to see if a new leader has been elected. Since leader election takes a bit of time, this property specifies the amount of time that the producer waits before refreshing the metadata. | "100" | false | MEDIUM
 | *camel.sink.endpoint.sendBufferBytes* | Socket write buffer size | "131072" | false | MEDIUM
-| *camel.sink.endpoint.serializerClass* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.sink.endpoint.valueSerializer* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.sink.endpoint.workerPool* | To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed. | null | false | MEDIUM
 | *camel.sink.endpoint.workerPoolCoreSize* | Number of core threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "10" | false | MEDIUM
 | *camel.sink.endpoint.workerPoolMaxSize* | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "20" | false | MEDIUM
@@ -107,9 +107,9 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.component.kafka.compressionCodec* | This parameter allows you to specify the compression codec for all data generated by this producer. Valid values are none, gzip and snappy. One of: [none] [gzip] [snappy] [lz4] | "none" | false | MEDIUM
 | *camel.component.kafka.connectionMaxIdleMs* | Close idle connections after the number of milliseconds specified by this config. | "540000" | false | MEDIUM
 | *camel.component.kafka.enableIdempotence* | If set to 'true' the producer will ensure that exactly one copy of each message is written in the stream. If 'false', producer retries may write duplicates of the retried message in the stream. If set to true this option will require max.in.flight.requests.per.connection to be set to 1 and retries cannot be zero and additionally acks must be set to 'all'. | false | false | MEDIUM
-| *camel.component.kafka.kafkaHeaderSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
+| *camel.component.kafka.headerSerializer* | To use a custom KafkaHeaderSerializer to serialize kafka headers values | null | false | MEDIUM
 | *camel.component.kafka.key* | The record key (or null if no key is specified). If this option has been configured then it take precedence over header KafkaConstants#KEY | null | false | MEDIUM
-| *camel.component.kafka.keySerializerClass* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.component.kafka.keySerializer* | The serializer class for keys (defaults to the same as for messages if nothing is given). | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.component.kafka.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then c [...]
 | *camel.component.kafka.lingerMs* | The producer groups together any records that arrive in between request transmissions into a single batched request. Normally this occurs only under load when records arrive faster than they can be sent out. However in some circumstances the client may want to reduce the number of requests even under moderate load. This setting accomplishes this by adding a small amount of artificial delay that is, rather than immediately sending out a record the prod [...]
 | *camel.component.kafka.maxBlockMs* | The configuration controls how long sending to kafka will block. These methods can be blocked for multiple reasons. For e.g: buffer full, metadata unavailable.This configuration imposes maximum limit on the total time spent in fetching metadata, serialization of key and value, partitioning and allocation of buffer memory when doing a send(). In case of partitionsFor(), this configuration imposes a maximum time threshold on waiting for metadata | "60 [...]
@@ -131,7 +131,7 @@ The camel-kafka sink connector supports 134 options, which are listed below.
 | *camel.component.kafka.retries* | Setting a value greater than zero will cause the client to resend any record whose send fails with a potentially transient error. Note that this retry is no different than if the client resent the record upon receiving the error. Allowing retries will potentially change the ordering of records because if two records are sent to a single partition, and the first fails and is retried but the second succeeds, then the second record may appear first. | "0" [...]
 | *camel.component.kafka.retryBackoffMs* | Before each retry, the producer refreshes the metadata of relevant topics to see if a new leader has been elected. Since leader election takes a bit of time, this property specifies the amount of time that the producer waits before refreshing the metadata. | "100" | false | MEDIUM
 | *camel.component.kafka.sendBufferBytes* | Socket write buffer size | "131072" | false | MEDIUM
-| *camel.component.kafka.serializerClass* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
+| *camel.component.kafka.valueSerializer* | The serializer class for messages. | "org.apache.kafka.common.serialization.StringSerializer" | false | MEDIUM
 | *camel.component.kafka.workerPool* | To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed. | null | false | MEDIUM
 | *camel.component.kafka.workerPoolCoreSize* | Number of core threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "10" | false | MEDIUM
 | *camel.component.kafka.workerPoolMaxSize* | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | "20" | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-source-connector.adoc
index 41f8248..d0d3a71 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kafka-kafka-source-connector.adoc
@@ -51,8 +51,8 @@ The camel-kafka source connector supports 121 options, which are listed below.
 | *camel.source.endpoint.fetchMinBytes* | The minimum amount of data the server should return for a fetch request. If insufficient data is available the request will wait for that much data to accumulate before answering the request. | "1" | false | MEDIUM
 | *camel.source.endpoint.fetchWaitMaxMs* | The maximum amount of time the server will block before answering the fetch request if there isn't sufficient data to immediately satisfy fetch.min.bytes | "500" | false | MEDIUM
 | *camel.source.endpoint.groupId* | A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers. | null | false | MEDIUM
+| *camel.source.endpoint.headerDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.source.endpoint.heartbeatIntervalMs* | The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower to control the expected time for normal r [...]
-| *camel.source.endpoint.kafkaHeaderDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.source.endpoint.keyDeserializer* | Deserializer class for key that implements the Deserializer interface. | "org.apache.kafka.common.serialization.StringDeserializer" | false | MEDIUM
 | *camel.source.endpoint.maxPartitionFetchBytes* | The maximum amount of data per-partition the server will return. The maximum total memory used for a request will be #partitions max.partition.fetch.bytes. This size must be at least as large as the maximum message size the server allows or else it is possible for the producer to send messages larger than the consumer can fetch. If that happens, the consumer can get stuck trying to fetch a large message on a certain partition. | "1048576 [...]
 | *camel.source.endpoint.maxPollIntervalMs* | The maximum delay between invocations of poll() when using consumer group management. This places an upper bound on the amount of time that the consumer can be idle before fetching more records. If poll() is not called before expiration of this timeout, then the consumer is considered failed and the group will rebalance in order to reassign the partitions to another member. | null | false | MEDIUM
@@ -112,8 +112,8 @@ The camel-kafka source connector supports 121 options, which are listed below.
 | *camel.component.kafka.fetchMinBytes* | The minimum amount of data the server should return for a fetch request. If insufficient data is available the request will wait for that much data to accumulate before answering the request. | "1" | false | MEDIUM
 | *camel.component.kafka.fetchWaitMaxMs* | The maximum amount of time the server will block before answering the fetch request if there isn't sufficient data to immediately satisfy fetch.min.bytes | "500" | false | MEDIUM
 | *camel.component.kafka.groupId* | A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers. | null | false | MEDIUM
+| *camel.component.kafka.headerDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.component.kafka.heartbeatIntervalMs* | The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower to control the expected time for normal r [...]
-| *camel.component.kafka.kafkaHeaderDeserializer* | To use a custom KafkaHeaderDeserializer to deserialize kafka headers values | null | false | MEDIUM
 | *camel.component.kafka.keyDeserializer* | Deserializer class for key that implements the Deserializer interface. | "org.apache.kafka.common.serialization.StringDeserializer" | false | MEDIUM
 | *camel.component.kafka.maxPartitionFetchBytes* | The maximum amount of data per-partition the server will return. The maximum total memory used for a request will be #partitions max.partition.fetch.bytes. This size must be at least as large as the maximum message size the server allows or else it is possible for the producer to send messages larger than the consumer can fetch. If that happens, the consumer can get stuck trying to fetch a large message on a certain partition. | "1048576 [...]
 | *camel.component.kafka.maxPollIntervalMs* | The maximum delay between invocations of poll() when using consumer group management. This places an upper bound on the amount of time that the consumer can be idle before fetching more records. If poll() is not called before expiration of this timeout, then the consumer is considered failed and the group will rebalance in order to reassign the partitions to another member. | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-custom-resources-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-custom-resources-kafka-sink-connector.adoc
new file mode 100644
index 0000000..7eef4e7
--- /dev/null
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-custom-resources-kafka-sink-connector.adoc
@@ -0,0 +1,78 @@
+// kafka-connector options: START
+[[camel-kubernetes-custom-resources-kafka-connector-sink]]
+= camel-kubernetes-custom-resources-kafka-connector sink configuration
+
+When using camel-kubernetes-custom-resources-kafka-connector as sink make sure to use the following Maven dependency to have support for the connector:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel.kafkaconnector</groupId>
+  <artifactId>camel-kubernetes-custom-resources-kafka-connector</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel Kafka connector version -->
+</dependency>
+----
+
+To use this Sink connector in Kafka connect you'll need to set the following connector.class
+
+[source,java]
+----
+connector.class=org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSinkConnector
+----
+
+
+The camel-kubernetes-custom-resources sink connector supports 25 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,1,1",options="header"]
+|===
+| Name | Description | Default | Required | Priority
+| *camel.sink.path.masterUrl* | Kubernetes Master url | null | true | HIGH
+| *camel.sink.endpoint.apiVersion* | The Kubernetes API Version to use | null | false | MEDIUM
+| *camel.sink.endpoint.dnsDomain* | The dns domain, used for ServiceCall EIP | null | false | MEDIUM
+| *camel.sink.endpoint.kubernetesClient* | Default KubernetesClient to use if provided | null | false | MEDIUM
+| *camel.sink.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
+| *camel.sink.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
+| *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
+| *camel.sink.endpoint.operation* | Producer operation to do on Kubernetes | null | false | MEDIUM
+| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
+| *camel.sink.endpoint.connectionTimeout* | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. | null | false | MEDIUM
+| *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
+| *camel.sink.endpoint.caCertData* | The CA Cert Data | null | false | MEDIUM
+| *camel.sink.endpoint.caCertFile* | The CA Cert File | null | false | MEDIUM
+| *camel.sink.endpoint.clientCertData* | The Client Cert Data | null | false | MEDIUM
+| *camel.sink.endpoint.clientCertFile* | The Client Cert File | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyAlgo* | The Key Algorithm used by the client | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyData* | The Client Key data | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyFile* | The Client Key file | null | false | MEDIUM
+| *camel.sink.endpoint.clientKeyPassphrase* | The Client Key Passphrase | null | false | MEDIUM
+| *camel.sink.endpoint.oauthToken* | The Auth Token | null | false | MEDIUM
+| *camel.sink.endpoint.password* | Password to connect to Kubernetes | null | false | MEDIUM
+| *camel.sink.endpoint.trustCerts* | Define if the certs we used are trusted anyway or not | null | false | MEDIUM
+| *camel.sink.endpoint.username* | Username to connect to Kubernetes | null | false | MEDIUM
+| *camel.component.kubernetes-custom-resources.lazy StartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first mess [...]
+| *camel.component.kubernetes-custom-resources.basic PropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+|===
+
+
+
+The camel-kubernetes-custom-resources sink connector has no converters out of the box.
+
+
+
+
+
+The camel-kubernetes-custom-resources sink connector has no transforms out of the box.
+
+
+
+
+
+The camel-kubernetes-custom-resources sink connector has no aggregation strategies out of the box.
+
+
+
+
+// kafka-connector options: END
diff --git a/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-custom-resources-kafka-source-connector.adoc
similarity index 66%
copy from connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
copy to docs/modules/ROOT/pages/connectors/camel-kubernetes-custom-resources-kafka-source-connector.adoc
index 8268d5a..392112e 100644
--- a/connectors/camel-kubernetes-pods-kafka-connector/src/main/docs/camel-kubernetes-pods-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-custom-resources-kafka-source-connector.adoc
@@ -1,14 +1,14 @@
 // kafka-connector options: START
-[[camel-kubernetes-pods-kafka-connector-source]]
-= camel-kubernetes-pods-kafka-connector source configuration
+[[camel-kubernetes-custom-resources-kafka-connector-source]]
+= camel-kubernetes-custom-resources-kafka-connector source configuration
 
-When using camel-kubernetes-pods-kafka-connector as source make sure to use the following Maven dependency to have support for the connector:
+When using camel-kubernetes-custom-resources-kafka-connector as source make sure to use the following Maven dependency to have support for the connector:
 
 [source,xml]
 ----
 <dependency>
   <groupId>org.apache.camel.kafkaconnector</groupId>
-  <artifactId>camel-kubernetes-pods-kafka-connector</artifactId>
+  <artifactId>camel-kubernetes-custom-resources-kafka-connector</artifactId>
   <version>x.x.x</version>
   <!-- use the same version as your Camel Kafka connector version -->
 </dependency>
@@ -18,11 +18,11 @@ To use this Source connector in Kafka connect you'll need to set the following c
 
 [source,java]
 ----
-connector.class=org.apache.camel.kafkaconnector.kubernetespods.CamelKubernetespodsSourceConnector
+connector.class=org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSourceConnector
 ----
 
 
-The camel-kubernetes-pods source connector supports 31 options, which are listed below.
+The camel-kubernetes-custom-resources source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-pods source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
@@ -58,23 +63,27 @@ The camel-kubernetes-pods source connector supports 31 options, which are listed
 | *camel.source.endpoint.password* | Password to connect to Kubernetes | null | false | MEDIUM
 | *camel.source.endpoint.trustCerts* | Define if the certs we used are trusted anyway or not | null | false | MEDIUM
 | *camel.source.endpoint.username* | Username to connect to Kubernetes | null | false | MEDIUM
-| *camel.component.kubernetes-pods.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.kubernetes-pods.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.kubernetes-custom-resources.bridge ErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | fal [...]
+| *camel.component.kubernetes-custom-resources.basic PropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
 |===
 
 
 
-The camel-kubernetes-pods sink connector has no converters out of the box.
+The camel-kubernetes-custom-resources sink connector has no converters out of the box.
 
 
 
 
 
-The camel-kubernetes-pods sink connector has no transforms out of the box.
+The camel-kubernetes-custom-resources sink connector has no transforms out of the box.
 
 
 
 
 
-The camel-kubernetes-pods sink connector has no aggregation strategies out of the box.
+The camel-kubernetes-custom-resources sink connector has no aggregation strategies out of the box.
+
+
+
+
 // kafka-connector options: END
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-deployments-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-deployments-kafka-source-connector.adoc
index 50b850b..af44770 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-deployments-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-deployments-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesdeployments.CamelKuber
 ----
 
 
-The camel-kubernetes-deployments source connector supports 31 options, which are listed below.
+The camel-kubernetes-deployments source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-deployments source connector supports 31 options, which are
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-hpa-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-hpa-kafka-source-connector.adoc
index 41f8af4..7478695 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-hpa-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-hpa-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kuberneteshpa.CamelKuberneteshpa
 ----
 
 
-The camel-kubernetes-hpa source connector supports 31 options, which are listed below.
+The camel-kubernetes-hpa source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-hpa source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-job-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-job-kafka-source-connector.adoc
index 5567b8e..c004ffe 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-job-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-job-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesjob.CamelKubernetesjob
 ----
 
 
-The camel-kubernetes-job source connector supports 31 options, which are listed below.
+The camel-kubernetes-job source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-job source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-namespaces-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-namespaces-kafka-source-connector.adoc
index 9f4800f..f91d7d5 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-namespaces-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-namespaces-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesnamespaces.CamelKubern
 ----
 
 
-The camel-kubernetes-namespaces source connector supports 31 options, which are listed below.
+The camel-kubernetes-namespaces source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-namespaces source connector supports 31 options, which are
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-nodes-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-nodes-kafka-source-connector.adoc
index 0142cb6..f894c79 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-nodes-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-nodes-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesnodes.CamelKubernetesn
 ----
 
 
-The camel-kubernetes-nodes source connector supports 31 options, which are listed below.
+The camel-kubernetes-nodes source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-nodes source connector supports 31 options, which are liste
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-pods-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-pods-kafka-source-connector.adoc
index 8268d5a..0144dfe 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-pods-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-pods-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetespods.CamelKubernetespo
 ----
 
 
-The camel-kubernetes-pods source connector supports 31 options, which are listed below.
+The camel-kubernetes-pods source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-pods source connector supports 31 options, which are listed
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-replication-controllers-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-replication-controllers-kafka-source-connector.adoc
index 9558c33..d02bebb 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-replication-controllers-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-replication-controllers-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesreplicationcontrollers
 ----
 
 
-The camel-kubernetes-replication-controllers source connector supports 31 options, which are listed below.
+The camel-kubernetes-replication-controllers source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-replication-controllers source connector supports 31 option
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-kubernetes-services-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-kubernetes-services-kafka-source-connector.adoc
index cb22eb5..9959302 100644
--- a/docs/modules/ROOT/pages/connectors/camel-kubernetes-services-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-kubernetes-services-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.kubernetesservices.CamelKubernet
 ----
 
 
-The camel-kubernetes-services source connector supports 31 options, which are listed below.
+The camel-kubernetes-services source connector supports 36 options, which are listed below.
 
 
 
@@ -36,6 +36,11 @@ The camel-kubernetes-services source connector supports 31 options, which are li
 | *camel.source.endpoint.portName* | The port name, used for ServiceCall EIP | null | false | MEDIUM
 | *camel.source.endpoint.portProtocol* | The port protocol, used for ServiceCall EIP | "tcp" | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
+| *camel.source.endpoint.crdGroup* | The Consumer CRD Resource Group we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdName* | The Consumer CRD Resource name we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdPlural* | The Consumer CRD Resource Plural we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdScope* | The Consumer CRD Resource Scope we would like to watch | null | false | MEDIUM
+| *camel.source.endpoint.crdVersion* | The Consumer CRD Resource Version we would like to watch | null | false | MEDIUM
 | *camel.source.endpoint.labelKey* | The Consumer Label key when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.labelValue* | The Consumer Label value when watching at some resources | null | false | MEDIUM
 | *camel.source.endpoint.namespace* | The namespace | null | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-pulsar-kafka-source-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-pulsar-kafka-source-connector.adoc
index 61f835b..ac577d8 100644
--- a/docs/modules/ROOT/pages/connectors/camel-pulsar-kafka-source-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-pulsar-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.pulsar.CamelPulsarSourceConnecto
 ----
 
 
-The camel-pulsar source connector supports 45 options, which are listed below.
+The camel-pulsar source connector supports 47 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The camel-pulsar source connector supports 45 options, which are listed below.
 | *camel.source.endpoint.maxRedeliverCount* | Maximum number of times that a message will be redelivered before being sent to the dead letter queue. If this value is not set, no Dead Letter Policy will be created | null | false | MEDIUM
 | *camel.source.endpoint.negativeAckRedeliveryDelay Micros* | Set the negative acknowledgement delay | 60000000L | false | MEDIUM
 | *camel.source.endpoint.numberOfConsumers* | Number of consumers - defaults to 1 | 1 | false | MEDIUM
+| *camel.source.endpoint.readCompacted* | Enable compacted topic reading. | false | false | MEDIUM
 | *camel.source.endpoint.subscriptionInitialPosition* | Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST] | "LATEST" | false | MEDIUM
 | *camel.source.endpoint.subscriptionName* | Name of the subscription to use | "subs" | false | MEDIUM
 | *camel.source.endpoint.subscriptionTopicsMode* | Determines to which topics this consumer should be subscribed to - Persistent, Non-Persistent, or both. Only used with pattern subscriptions. One of: [PersistentOnly] [NonPersistentOnly] [AllTopics] | "PersistentOnly" | false | MEDIUM
@@ -65,6 +66,7 @@ The camel-pulsar source connector supports 45 options, which are listed below.
 | *camel.component.pulsar.maxRedeliverCount* | Maximum number of times that a message will be redelivered before being sent to the dead letter queue. If this value is not set, no Dead Letter Policy will be created | null | false | MEDIUM
 | *camel.component.pulsar.negativeAckRedeliveryDelay Micros* | Set the negative acknowledgement delay | 60000000L | false | MEDIUM
 | *camel.component.pulsar.numberOfConsumers* | Number of consumers - defaults to 1 | 1 | false | MEDIUM
+| *camel.component.pulsar.readCompacted* | Enable compacted topic reading. | false | false | MEDIUM
 | *camel.component.pulsar.subscriptionInitialPosition* | Control the initial position in the topic of a newly created subscription. Default is latest message. One of: [EARLIEST] [LATEST] | "LATEST" | false | MEDIUM
 | *camel.component.pulsar.subscriptionName* | Name of the subscription to use | "subs" | false | MEDIUM
 | *camel.component.pulsar.subscriptionTopicsMode* | Determines to which topics this consumer should be subscribed to - Persistent, Non-Persistent, or both. Only used with pattern subscriptions. One of: [PersistentOnly] [NonPersistentOnly] [AllTopics] | "PersistentOnly" | false | MEDIUM
diff --git a/docs/modules/ROOT/pages/connectors/camel-vertx-websocket-kafka-sink-connector.adoc b/docs/modules/ROOT/pages/connectors/camel-vertx-websocket-kafka-sink-connector.adoc
index 95cc27e..de18bdb 100644
--- a/docs/modules/ROOT/pages/connectors/camel-vertx-websocket-kafka-sink-connector.adoc
+++ b/docs/modules/ROOT/pages/connectors/camel-vertx-websocket-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.vertxwebsocket.CamelVertxwebsock
 ----
 
 
-The camel-vertx-websocket sink connector supports 15 options, which are listed below.
+The camel-vertx-websocket sink connector supports 16 options, which are listed below.
 
 
 
@@ -33,6 +33,7 @@ The camel-vertx-websocket sink connector supports 15 options, which are listed b
 | *camel.sink.path.port* | The port that the consumer should bind to or port of the remote websocket destination that the producer should connect to | 0 | false | MEDIUM
 | *camel.sink.path.path* | The path that the consumer should bind to or path of the remote websocket destination that the producer should connect to | "/" | true | HIGH
 | *camel.sink.endpoint.clientOptions* | Sets customized options for configuring the WebSocket client used in the producer | null | false | MEDIUM
+| *camel.sink.endpoint.clientSubProtocols* | Comma separated list of WebSocket subprotocols that the client should use for the Sec-WebSocket-Protocol header | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.sendToAll* | To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the VertxWebsocketConstants.SEND_TO_ALL header on the message. | false | false | MEDIUM
 | *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM


[camel-kafka-connector] 04/21: [create-pull-request] automated change

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 5c5be963e472bc397164c99f19b1de5d8129efc8
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Mon Nov 9 03:22:02 2020 +0000

    [create-pull-request] automated change
---
 .../resources/connectors/camel-atlasmap-sink.json  |  99 +++++++++
 .../camel-kubernetes-custom-resources-sink.json    | 169 +++++++++++++++
 .../camel-kubernetes-custom-resources-source.json  | 236 +++++++++++++++++++++
 3 files changed, 504 insertions(+)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atlasmap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atlasmap-sink.json
new file mode 100644
index 0000000..5bf8f40
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atlasmap-sink.json
@@ -0,0 +1,99 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.atlasmap.CamelAtlasmapSinkConnector",
+		"artifactId": "camel-atlasmap-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-atlasmap-sink",
+		"type": "sink",
+		"version": "0.7.0-SNAPSHOT",
+		"description": "Transforms the message using an AtlasMap transformation."
+	},
+	"properties": {
+		"camel.sink.path.resourceUri": {
+			"name": "camel.sink.path.resourceUri",
+			"description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod.",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.sink.endpoint.allowContextMapAll": {
+			"name": "camel.sink.endpoint.allowContextMapAll",
+			"description": "Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.contentCache": {
+			"name": "camel.sink.endpoint.contentCache",
+			"description": "Sets whether to use resource content cache or not",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.lazyStartProducer": {
+			"name": "camel.sink.endpoint.lazyStartProducer",
+			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.sourceMapName": {
+			"name": "camel.sink.endpoint.sourceMapName",
+			"description": "The Exchange property name for a source message map which hold java.util.Map&lt;String, Message&gt; where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source properties where the scope equals to Document ID.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.targetMapMode": {
+			"name": "camel.sink.endpoint.targetMapMode",
+			"description": "TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores them into a java.util.Map, and the java.util.Map is set to an exchange property if 'targetMapName' is specified, otherwise message body. 'MESSAGE_HEADER': Stores them into message headers. 'EXCHANGE_PROPERTY': Stores them into exchange properties. ) One of: [MAP] [MESSAGE_HEADER] [EXCHANGE_PROPERTY]",
+			"defaultValue": "\"MAP\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.targetMapName": {
+			"name": "camel.sink.endpoint.targetMapName",
+			"description": "The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.basicPropertyBinding": {
+			"name": "camel.sink.endpoint.basicPropertyBinding",
+			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.propertiesFile": {
+			"name": "camel.sink.endpoint.propertiesFile",
+			"description": "The URI of the properties file which is used for AtlasContextFactory initialization.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.synchronous": {
+			"name": "camel.sink.endpoint.synchronous",
+			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.atlasmap.lazyStartProducer": {
+			"name": "camel.component.atlasmap.lazyStartProducer",
+			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.atlasmap.atlasContextFactory": {
+			"name": "camel.component.atlasmap.atlasContextFactory",
+			"description": "To use the AtlasContextFactory otherwise a new engine is created.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.atlasmap.basicPropertyBinding": {
+			"name": "camel.component.atlasmap.basicPropertyBinding",
+			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+			"defaultValue": "false",
+			"priority": "LOW",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-sink.json
new file mode 100644
index 0000000..bff86b3
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-sink.json
@@ -0,0 +1,169 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSinkConnector",
+		"artifactId": "camel-kubernetes-custom-resources-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-kubernetes-custom-resources-sink",
+		"type": "sink",
+		"version": "0.7.0-SNAPSHOT",
+		"description": "Perform operations on Kubernetes Custom Resources and get notified on Deployment changes."
+	},
+	"properties": {
+		"camel.sink.path.masterUrl": {
+			"name": "camel.sink.path.masterUrl",
+			"description": "Kubernetes Master url",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.sink.endpoint.apiVersion": {
+			"name": "camel.sink.endpoint.apiVersion",
+			"description": "The Kubernetes API Version to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.dnsDomain": {
+			"name": "camel.sink.endpoint.dnsDomain",
+			"description": "The dns domain, used for ServiceCall EIP",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.kubernetesClient": {
+			"name": "camel.sink.endpoint.kubernetesClient",
+			"description": "Default KubernetesClient to use if provided",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.portName": {
+			"name": "camel.sink.endpoint.portName",
+			"description": "The port name, used for ServiceCall EIP",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.portProtocol": {
+			"name": "camel.sink.endpoint.portProtocol",
+			"description": "The port protocol, used for ServiceCall EIP",
+			"defaultValue": "\"tcp\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.lazyStartProducer": {
+			"name": "camel.sink.endpoint.lazyStartProducer",
+			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.operation": {
+			"name": "camel.sink.endpoint.operation",
+			"description": "Producer operation to do on Kubernetes",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.basicPropertyBinding": {
+			"name": "camel.sink.endpoint.basicPropertyBinding",
+			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.connectionTimeout": {
+			"name": "camel.sink.endpoint.connectionTimeout",
+			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.synchronous": {
+			"name": "camel.sink.endpoint.synchronous",
+			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.caCertData": {
+			"name": "camel.sink.endpoint.caCertData",
+			"description": "The CA Cert Data",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.caCertFile": {
+			"name": "camel.sink.endpoint.caCertFile",
+			"description": "The CA Cert File",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.clientCertData": {
+			"name": "camel.sink.endpoint.clientCertData",
+			"description": "The Client Cert Data",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.clientCertFile": {
+			"name": "camel.sink.endpoint.clientCertFile",
+			"description": "The Client Cert File",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.clientKeyAlgo": {
+			"name": "camel.sink.endpoint.clientKeyAlgo",
+			"description": "The Key Algorithm used by the client",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.clientKeyData": {
+			"name": "camel.sink.endpoint.clientKeyData",
+			"description": "The Client Key data",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.clientKeyFile": {
+			"name": "camel.sink.endpoint.clientKeyFile",
+			"description": "The Client Key file",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.clientKeyPassphrase": {
+			"name": "camel.sink.endpoint.clientKeyPassphrase",
+			"description": "The Client Key Passphrase",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.oauthToken": {
+			"name": "camel.sink.endpoint.oauthToken",
+			"description": "The Auth Token",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.password": {
+			"name": "camel.sink.endpoint.password",
+			"description": "Password to connect to Kubernetes",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.trustCerts": {
+			"name": "camel.sink.endpoint.trustCerts",
+			"description": "Define if the certs we used are trusted anyway or not",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.sink.endpoint.username": {
+			"name": "camel.sink.endpoint.username",
+			"description": "Username to connect to Kubernetes",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.kubernetes-custom-resources.lazyStartProducer": {
+			"name": "camel.component.kubernetes-custom-resources.lazyStartProducer",
+			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.kubernetes-custom-resources.basicPropertyBinding": {
+			"name": "camel.component.kubernetes-custom-resources.basicPropertyBinding",
+			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+			"defaultValue": "false",
+			"priority": "LOW",
+			"required": "false"
+		}
+	}
+}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-source.json
new file mode 100644
index 0000000..740c5a2
--- /dev/null
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-source.json
@@ -0,0 +1,236 @@
+{
+	"connector": {
+		"class": "org.apache.camel.kafkaconnector.kubernetescustomresources.CamelKubernetescustomresourcesSourceConnector",
+		"artifactId": "camel-kubernetes-custom-resources-kafka-connector",
+		"groupId": "org.apache.camel.kafkaconnector",
+		"id": "camel-kubernetes-custom-resources-source",
+		"type": "source",
+		"version": "0.7.0-SNAPSHOT",
+		"description": "Perform operations on Kubernetes Custom Resources and get notified on Deployment changes."
+	},
+	"properties": {
+		"camel.source.path.masterUrl": {
+			"name": "camel.source.path.masterUrl",
+			"description": "Kubernetes Master url",
+			"priority": "HIGH",
+			"required": "true"
+		},
+		"camel.source.endpoint.apiVersion": {
+			"name": "camel.source.endpoint.apiVersion",
+			"description": "The Kubernetes API Version to use",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.dnsDomain": {
+			"name": "camel.source.endpoint.dnsDomain",
+			"description": "The dns domain, used for ServiceCall EIP",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.kubernetesClient": {
+			"name": "camel.source.endpoint.kubernetesClient",
+			"description": "Default KubernetesClient to use if provided",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.portName": {
+			"name": "camel.source.endpoint.portName",
+			"description": "The port name, used for ServiceCall EIP",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.portProtocol": {
+			"name": "camel.source.endpoint.portProtocol",
+			"description": "The port protocol, used for ServiceCall EIP",
+			"defaultValue": "\"tcp\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.bridgeErrorHandler": {
+			"name": "camel.source.endpoint.bridgeErrorHandler",
+			"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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdGroup": {
+			"name": "camel.source.endpoint.crdGroup",
+			"description": "The Consumer CRD Resource Group we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdName": {
+			"name": "camel.source.endpoint.crdName",
+			"description": "The Consumer CRD Resource name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdPlural": {
+			"name": "camel.source.endpoint.crdPlural",
+			"description": "The Consumer CRD Resource Plural we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdScope": {
+			"name": "camel.source.endpoint.crdScope",
+			"description": "The Consumer CRD Resource Scope we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.crdVersion": {
+			"name": "camel.source.endpoint.crdVersion",
+			"description": "The Consumer CRD Resource Version we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.labelKey": {
+			"name": "camel.source.endpoint.labelKey",
+			"description": "The Consumer Label key when watching at some resources",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.labelValue": {
+			"name": "camel.source.endpoint.labelValue",
+			"description": "The Consumer Label value when watching at some resources",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.namespace": {
+			"name": "camel.source.endpoint.namespace",
+			"description": "The namespace",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.poolSize": {
+			"name": "camel.source.endpoint.poolSize",
+			"description": "The Consumer pool size",
+			"defaultValue": "1",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.resourceName": {
+			"name": "camel.source.endpoint.resourceName",
+			"description": "The Consumer Resource Name we would like to watch",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.exceptionHandler": {
+			"name": "camel.source.endpoint.exceptionHandler",
+			"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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.exchangePattern": {
+			"name": "camel.source.endpoint.exchangePattern",
+			"description": "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.basicPropertyBinding": {
+			"name": "camel.source.endpoint.basicPropertyBinding",
+			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.connectionTimeout": {
+			"name": "camel.source.endpoint.connectionTimeout",
+			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.synchronous": {
+			"name": "camel.source.endpoint.synchronous",
+			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.caCertData": {
+			"name": "camel.source.endpoint.caCertData",
+			"description": "The CA Cert Data",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.caCertFile": {
+			"name": "camel.source.endpoint.caCertFile",
+			"description": "The CA Cert File",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.clientCertData": {
+			"name": "camel.source.endpoint.clientCertData",
+			"description": "The Client Cert Data",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.clientCertFile": {
+			"name": "camel.source.endpoint.clientCertFile",
+			"description": "The Client Cert File",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.clientKeyAlgo": {
+			"name": "camel.source.endpoint.clientKeyAlgo",
+			"description": "The Key Algorithm used by the client",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.clientKeyData": {
+			"name": "camel.source.endpoint.clientKeyData",
+			"description": "The Client Key data",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.clientKeyFile": {
+			"name": "camel.source.endpoint.clientKeyFile",
+			"description": "The Client Key file",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.clientKeyPassphrase": {
+			"name": "camel.source.endpoint.clientKeyPassphrase",
+			"description": "The Client Key Passphrase",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.oauthToken": {
+			"name": "camel.source.endpoint.oauthToken",
+			"description": "The Auth Token",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.password": {
+			"name": "camel.source.endpoint.password",
+			"description": "Password to connect to Kubernetes",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.trustCerts": {
+			"name": "camel.source.endpoint.trustCerts",
+			"description": "Define if the certs we used are trusted anyway or not",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.username": {
+			"name": "camel.source.endpoint.username",
+			"description": "Username to connect to Kubernetes",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.kubernetes-custom-resources.bridgeErrorHandler": {
+			"name": "camel.component.kubernetes-custom-resources.bridgeErrorHandler",
+			"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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.kubernetes-custom-resources.basicPropertyBinding": {
+			"name": "camel.component.kubernetes-custom-resources.basicPropertyBinding",
+			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+			"defaultValue": "false",
+			"priority": "LOW",
+			"required": "false"
+		}
+	}
+}


[camel-kafka-connector] 11/21: Camel-Master: Fix catalog test

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit cf42b2937fd4e0f876e18d82b3ea043d63e1b0dd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 19 06:58:51 2020 +0100

    Camel-Master: Fix catalog test
---
 .../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 5f909c5..4bcd084 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -74,7 +74,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector", model.getGroupId());
         assertEquals("sink", model.getType());
         assertEquals("org.apache.camel.kafkaconnector.aws2sns.CamelAws2snsSinkConnector", model.getConnectorClass());
-        assertEquals(43, model.getOptions().size());
+        assertEquals(41, model.getOptions().size());
         assertEquals("camel.sink.path.topicNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonSNSClient", model.getOptions().get(1).getName());
         assertEquals("camel.sink.endpoint.autoCreateTopic", model.getOptions().get(2).getName());


[camel-kafka-connector] 13/21: Regen

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 7cbd010cbc7ca81f1dc50a2a800f517b2bab9144
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 19 10:41:46 2020 +0100

    Regen
---
 .../resources/connectors/camel-aws2-s3-sink.json   |  31 +----
 .../resources/connectors/camel-aws2-s3-source.json |  31 +----
 .../resources/connectors/camel-netty-sink.json     |  17 +--
 .../resources/connectors/camel-netty-source.json   |  17 +--
 .../resources/connectors/camel-workday-sink.json   |  17 +--
 .../resources/connectors/camel-xchange-sink.json   |  17 +--
 .../resources/connectors/camel-xj-sink.json        |  17 +--
 .../connectors/camel-xmlsecurity-sign-sink.json    |  17 +--
 .../connectors/camel-xmlsecurity-verify-sink.json  |  17 +--
 .../resources/connectors/camel-xmpp-sink.json      |  17 +--
 .../resources/connectors/camel-xmpp-source.json    |  17 +--
 .../resources/connectors/camel-xquery-sink.json    |  17 +--
 .../resources/connectors/camel-xquery-source.json  |  17 +--
 .../connectors/camel-xslt-saxon-sink.json          |  17 +--
 .../resources/connectors/camel-xslt-sink.json      |  17 +--
 .../resources/connectors/camel-yammer-sink.json    |  17 +--
 .../resources/connectors/camel-yammer-source.json  |  17 +--
 .../resources/connectors/camel-zendesk-sink.json   |  17 +--
 .../resources/connectors/camel-zendesk-source.json |  17 +--
 .../connectors/camel-zookeeper-master-source.json  |  17 +--
 .../resources/connectors/camel-zookeeper-sink.json |  17 +--
 .../connectors/camel-zookeeper-source.json         |  17 +--
 .../generated/resources/camel-activemq-sink.json   |  17 +--
 .../generated/resources/camel-activemq-source.json |  17 +--
 .../docs/camel-activemq-kafka-sink-connector.adoc  |   5 +-
 .../camel-activemq-kafka-source-connector.adoc     |   5 +-
 .../activemq/CamelActivemqSinkConnectorConfig.java |  12 +-
 .../CamelActivemqSourceConnectorConfig.java        |  12 +-
 .../src/generated/resources/camel-ahc-sink.json    |  17 +--
 .../main/docs/camel-ahc-kafka-sink-connector.adoc  |   5 +-
 .../ahc/CamelAhcSinkConnectorConfig.java           |  12 +-
 .../src/generated/resources/camel-ahc-ws-sink.json |  17 +--
 .../generated/resources/camel-ahc-ws-source.json   |  17 +--
 .../docs/camel-ahc-ws-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-ahc-ws-kafka-source-connector.adoc  |   5 +-
 .../ahcws/CamelAhcwsSinkConnectorConfig.java       |  12 +-
 .../ahcws/CamelAhcwsSourceConnectorConfig.java     |  12 +-
 .../generated/resources/camel-ahc-wss-sink.json    |  17 +--
 .../generated/resources/camel-ahc-wss-source.json  |  17 +--
 .../docs/camel-ahc-wss-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-ahc-wss-kafka-source-connector.adoc |   5 +-
 .../ahcwss/CamelAhcwssSinkConnectorConfig.java     |  12 +-
 .../ahcwss/CamelAhcwssSourceConnectorConfig.java   |  12 +-
 .../src/generated/resources/camel-amqp-sink.json   |  17 +--
 .../src/generated/resources/camel-amqp-source.json |  17 +--
 .../main/docs/camel-amqp-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-amqp-kafka-source-connector.adoc    |   5 +-
 .../amqp/CamelAmqpSinkConnectorConfig.java         |  12 +-
 .../amqp/CamelAmqpSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-apns-sink.json   |  17 +--
 .../src/generated/resources/camel-apns-source.json |  17 +--
 .../main/docs/camel-apns-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-apns-kafka-source-connector.adoc    |   5 +-
 .../apns/CamelApnsSinkConnectorConfig.java         |  12 +-
 .../apns/CamelApnsSourceConnectorConfig.java       |  12 +-
 .../generated/resources/camel-arangodb-sink.json   |  17 +--
 .../docs/camel-arangodb-kafka-sink-connector.adoc  |   5 +-
 .../arangodb/CamelArangodbSinkConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-as2-sink.json    |  17 +--
 .../src/generated/resources/camel-as2-source.json  |  17 +--
 .../main/docs/camel-as2-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-as2-kafka-source-connector.adoc     |   5 +-
 .../as2/CamelAs2SinkConnectorConfig.java           |  12 +-
 .../as2/CamelAs2SourceConnectorConfig.java         |  12 +-
 .../generated/resources/camel-asterisk-sink.json   |  17 +--
 .../generated/resources/camel-asterisk-source.json |  17 +--
 .../docs/camel-asterisk-kafka-sink-connector.adoc  |   5 +-
 .../camel-asterisk-kafka-source-connector.adoc     |   5 +-
 .../asterisk/CamelAsteriskSinkConnectorConfig.java |  12 +-
 .../CamelAsteriskSourceConnectorConfig.java        |  12 +-
 .../generated/resources/camel-atlasmap-sink.json   |  19 +---
 .../docs/camel-atlasmap-kafka-sink-connector.adoc  |   9 +-
 .../atlasmap/CamelAtlasmapSinkConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-atmos-sink.json  |  17 +--
 .../generated/resources/camel-atmos-source.json    |  17 +--
 .../docs/camel-atmos-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-atmos-kafka-source-connector.adoc   |   5 +-
 .../atmos/CamelAtmosSinkConnectorConfig.java       |  12 +-
 .../atmos/CamelAtmosSourceConnectorConfig.java     |  12 +-
 .../resources/camel-atmosphere-websocket-sink.json |  17 +--
 .../camel-atmosphere-websocket-source.json         |  17 +--
 ...-atmosphere-websocket-kafka-sink-connector.adoc |   5 +-
 ...tmosphere-websocket-kafka-source-connector.adoc |   5 +-
 ...amelAtmospherewebsocketSinkConnectorConfig.java |  12 +-
 ...elAtmospherewebsocketSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-atom-source.json |  17 +--
 .../docs/camel-atom-kafka-source-connector.adoc    |   5 +-
 .../atom/CamelAtomSourceConnectorConfig.java       |  12 +-
 .../generated/resources/camel-atomix-map-sink.json |  17 +--
 .../resources/camel-atomix-map-source.json         |  17 +--
 .../camel-atomix-map-kafka-sink-connector.adoc     |   5 +-
 .../camel-atomix-map-kafka-source-connector.adoc   |   5 +-
 .../CamelAtomixmapSinkConnectorConfig.java         |  12 +-
 .../CamelAtomixmapSourceConnectorConfig.java       |  12 +-
 .../resources/camel-atomix-messaging-sink.json     |  17 +--
 .../resources/camel-atomix-messaging-source.json   |  17 +--
 ...amel-atomix-messaging-kafka-sink-connector.adoc |   5 +-
 ...el-atomix-messaging-kafka-source-connector.adoc |   5 +-
 .../CamelAtomixmessagingSinkConnectorConfig.java   |  12 +-
 .../CamelAtomixmessagingSourceConnectorConfig.java |  12 +-
 .../resources/camel-atomix-multimap-sink.json      |  17 +--
 ...camel-atomix-multimap-kafka-sink-connector.adoc |   5 +-
 .../CamelAtomixmultimapSinkConnectorConfig.java    |  12 +-
 .../resources/camel-atomix-queue-sink.json         |  17 +--
 .../resources/camel-atomix-queue-source.json       |  17 +--
 .../camel-atomix-queue-kafka-sink-connector.adoc   |   5 +-
 .../camel-atomix-queue-kafka-source-connector.adoc |   5 +-
 .../CamelAtomixqueueSinkConnectorConfig.java       |  12 +-
 .../CamelAtomixqueueSourceConnectorConfig.java     |  12 +-
 .../generated/resources/camel-atomix-set-sink.json |  17 +--
 .../resources/camel-atomix-set-source.json         |  17 +--
 .../camel-atomix-set-kafka-sink-connector.adoc     |   5 +-
 .../camel-atomix-set-kafka-source-connector.adoc   |   5 +-
 .../CamelAtomixsetSinkConnectorConfig.java         |  12 +-
 .../CamelAtomixsetSourceConnectorConfig.java       |  12 +-
 .../resources/camel-atomix-value-sink.json         |  17 +--
 .../resources/camel-atomix-value-source.json       |  17 +--
 .../camel-atomix-value-kafka-sink-connector.adoc   |   5 +-
 .../camel-atomix-value-kafka-source-connector.adoc |   5 +-
 .../CamelAtomixvalueSinkConnectorConfig.java       |  12 +-
 .../CamelAtomixvalueSourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-avro-sink.json   |  17 +--
 .../src/generated/resources/camel-avro-source.json |  17 +--
 .../main/docs/camel-avro-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-avro-kafka-source-connector.adoc    |   5 +-
 .../avro/CamelAvroSinkConnectorConfig.java         |  12 +-
 .../avro/CamelAvroSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-aws-cw-sink.json |  17 +--
 .../docs/camel-aws-cw-kafka-sink-connector.adoc    |   5 +-
 .../awscw/CamelAwscwSinkConnectorConfig.java       |  12 +-
 .../generated/resources/camel-aws-ddb-sink.json    |  17 +--
 .../docs/camel-aws-ddb-kafka-sink-connector.adoc   |   5 +-
 .../awsddb/CamelAwsddbSinkConnectorConfig.java     |  12 +-
 .../resources/camel-aws-ddbstream-source.json      |  17 +--
 ...camel-aws-ddbstream-kafka-source-connector.adoc |   5 +-
 .../CamelAwsddbstreamSourceConnectorConfig.java    |  12 +-
 .../generated/resources/camel-aws-ec2-sink.json    |  17 +--
 .../docs/camel-aws-ec2-kafka-sink-connector.adoc   |   5 +-
 .../awsec2/CamelAwsec2SinkConnectorConfig.java     |  12 +-
 .../generated/resources/camel-aws-ecs-sink.json    |  17 +--
 .../docs/camel-aws-ecs-kafka-sink-connector.adoc   |   5 +-
 .../awsecs/CamelAwsecsSinkConnectorConfig.java     |  12 +-
 .../generated/resources/camel-aws-eks-sink.json    |  17 +--
 .../docs/camel-aws-eks-kafka-sink-connector.adoc   |   5 +-
 .../awseks/CamelAwseksSinkConnectorConfig.java     |  12 +-
 .../generated/resources/camel-aws-iam-sink.json    |  17 +--
 .../docs/camel-aws-iam-kafka-sink-connector.adoc   |   5 +-
 .../awsiam/CamelAwsiamSinkConnectorConfig.java     |  12 +-
 .../resources/camel-aws-kinesis-firehose-sink.json |  17 +--
 ...-aws-kinesis-firehose-kafka-sink-connector.adoc |   5 +-
 ...CamelAwskinesisfirehoseSinkConnectorConfig.java |  12 +-
 .../resources/camel-aws-kinesis-sink.json          |  17 +--
 .../resources/camel-aws-kinesis-source.json        |  17 +--
 .../camel-aws-kinesis-kafka-sink-connector.adoc    |   5 +-
 .../camel-aws-kinesis-kafka-source-connector.adoc  |   5 +-
 .../CamelAwskinesisSinkConnectorConfig.java        |  12 +-
 .../CamelAwskinesisSourceConnectorConfig.java      |  12 +-
 .../generated/resources/camel-aws-kms-sink.json    |  17 +--
 .../docs/camel-aws-kms-kafka-sink-connector.adoc   |   5 +-
 .../awskms/CamelAwskmsSinkConnectorConfig.java     |  12 +-
 .../generated/resources/camel-aws-lambda-sink.json |  21 ++--
 .../camel-aws-lambda-kafka-sink-connector.adoc     |   5 +-
 .../CamelAwslambdaSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-aws-mq-sink.json |  17 +--
 .../docs/camel-aws-mq-kafka-sink-connector.adoc    |   5 +-
 .../awsmq/CamelAwsmqSinkConnectorConfig.java       |  12 +-
 .../generated/resources/camel-aws-msk-sink.json    |  17 +--
 .../docs/camel-aws-msk-kafka-sink-connector.adoc   |   5 +-
 .../awsmsk/CamelAwsmskSinkConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-aws-s3-sink.json |  17 +--
 .../generated/resources/camel-aws-s3-source.json   |  17 +--
 .../docs/camel-aws-s3-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-aws-s3-kafka-source-connector.adoc  |   5 +-
 .../awss3/CamelAwss3SinkConnectorConfig.java       |  12 +-
 .../awss3/CamelAwss3SourceConnectorConfig.java     |  12 +-
 .../generated/resources/camel-aws-sdb-sink.json    |  17 +--
 .../docs/camel-aws-sdb-kafka-sink-connector.adoc   |   5 +-
 .../awssdb/CamelAwssdbSinkConnectorConfig.java     |  12 +-
 .../generated/resources/camel-aws-ses-sink.json    |  17 +--
 .../docs/camel-aws-ses-kafka-sink-connector.adoc   |   5 +-
 .../awsses/CamelAwssesSinkConnectorConfig.java     |  12 +-
 .../generated/resources/camel-aws-sns-sink.json    |  17 +--
 .../docs/camel-aws-sns-kafka-sink-connector.adoc   |   5 +-
 .../awssns/CamelAwssnsSinkConnectorConfig.java     |  12 +-
 .../generated/resources/camel-aws-sqs-sink.json    |  17 +--
 .../generated/resources/camel-aws-sqs-source.json  |  17 +--
 .../docs/camel-aws-sqs-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-aws-sqs-kafka-source-connector.adoc |   5 +-
 .../awssqs/CamelAwssqsSinkConnectorConfig.java     |  12 +-
 .../awssqs/CamelAwssqsSourceConnectorConfig.java   |  12 +-
 .../generated/resources/camel-aws-swf-sink.json    |  17 +--
 .../generated/resources/camel-aws-swf-source.json  |  17 +--
 .../docs/camel-aws-swf-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-aws-swf-kafka-source-connector.adoc |   5 +-
 .../awsswf/CamelAwsswfSinkConnectorConfig.java     |  12 +-
 .../awsswf/CamelAwsswfSourceConnectorConfig.java   |  12 +-
 .../resources/camel-aws-translate-sink.json        |  17 +--
 .../camel-aws-translate-kafka-sink-connector.adoc  |   5 +-
 .../CamelAwstranslateSinkConnectorConfig.java      |  12 +-
 .../resources/camel-aws2-athena-sink.json          |  31 +----
 .../camel-aws2-athena-kafka-sink-connector.adoc    |   7 +-
 .../CamelAws2athenaSinkConnectorConfig.java        |  20 +---
 .../generated/resources/camel-aws2-cw-sink.json    |  31 +----
 .../docs/camel-aws2-cw-kafka-sink-connector.adoc   |   7 +-
 .../aws2cw/CamelAws2cwSinkConnectorConfig.java     |  20 +---
 .../generated/resources/camel-aws2-ddb-sink.json   |  31 +----
 .../docs/camel-aws2-ddb-kafka-sink-connector.adoc  |   7 +-
 .../aws2ddb/CamelAws2ddbSinkConnectorConfig.java   |  20 +---
 .../resources/camel-aws2-ddbstream-source.json     |  31 +----
 ...amel-aws2-ddbstream-kafka-source-connector.adoc |   7 +-
 .../CamelAws2ddbstreamSourceConnectorConfig.java   |  20 +---
 .../generated/resources/camel-aws2-ec2-sink.json   |  31 +----
 .../docs/camel-aws2-ec2-kafka-sink-connector.adoc  |   7 +-
 .../aws2ec2/CamelAws2ec2SinkConnectorConfig.java   |  20 +---
 .../generated/resources/camel-aws2-ecs-sink.json   |  31 +----
 .../docs/camel-aws2-ecs-kafka-sink-connector.adoc  |   7 +-
 .../aws2ecs/CamelAws2ecsSinkConnectorConfig.java   |  20 +---
 .../generated/resources/camel-aws2-eks-sink.json   |  31 +----
 .../docs/camel-aws2-eks-kafka-sink-connector.adoc  |   7 +-
 .../aws2eks/CamelAws2eksSinkConnectorConfig.java   |  20 +---
 .../resources/camel-aws2-eventbridge-sink.json     |  31 +----
 ...amel-aws2-eventbridge-kafka-sink-connector.adoc |   7 +-
 .../CamelAws2eventbridgeSinkConnectorConfig.java   |  20 +---
 .../generated/resources/camel-aws2-iam-sink.json   |  31 +----
 .../docs/camel-aws2-iam-kafka-sink-connector.adoc  |   7 +-
 .../aws2iam/CamelAws2iamSinkConnectorConfig.java   |  20 +---
 .../camel-aws2-kinesis-firehose-sink.json          |  31 +----
 ...aws2-kinesis-firehose-kafka-sink-connector.adoc |   7 +-
 ...amelAws2kinesisfirehoseSinkConnectorConfig.java |  20 +---
 .../resources/camel-aws2-kinesis-sink.json         |  31 +----
 .../resources/camel-aws2-kinesis-source.json       |  31 +----
 .../camel-aws2-kinesis-kafka-sink-connector.adoc   |   7 +-
 .../camel-aws2-kinesis-kafka-source-connector.adoc |   7 +-
 .../CamelAws2kinesisSinkConnectorConfig.java       |  20 +---
 .../CamelAws2kinesisSourceConnectorConfig.java     |  20 +---
 .../generated/resources/camel-aws2-kms-sink.json   |  31 +----
 .../docs/camel-aws2-kms-kafka-sink-connector.adoc  |   7 +-
 .../aws2kms/CamelAws2kmsSinkConnectorConfig.java   |  20 +---
 .../resources/camel-aws2-lambda-sink.json          |  35 ++----
 .../camel-aws2-lambda-kafka-sink-connector.adoc    |   7 +-
 .../CamelAws2lambdaSinkConnectorConfig.java        |  20 +---
 .../generated/resources/camel-aws2-mq-sink.json    |  31 +----
 .../docs/camel-aws2-mq-kafka-sink-connector.adoc   |   7 +-
 .../aws2mq/CamelAws2mqSinkConnectorConfig.java     |  20 +---
 .../generated/resources/camel-aws2-msk-sink.json   |  31 +----
 .../docs/camel-aws2-msk-kafka-sink-connector.adoc  |   7 +-
 .../aws2msk/CamelAws2mskSinkConnectorConfig.java   |  20 +---
 .../generated/resources/camel-aws2-s3-sink.json    |  31 +----
 .../generated/resources/camel-aws2-s3-source.json  |  31 +----
 .../docs/camel-aws2-s3-kafka-sink-connector.adoc   |   7 +-
 .../docs/camel-aws2-s3-kafka-source-connector.adoc |   7 +-
 .../aws2s3/CamelAws2s3SinkConnectorConfig.java     |  20 +---
 .../aws2s3/CamelAws2s3SourceConnectorConfig.java   |  20 +---
 .../generated/resources/camel-aws2-ses-sink.json   |  31 +----
 .../docs/camel-aws2-ses-kafka-sink-connector.adoc  |   7 +-
 .../aws2ses/CamelAws2sesSinkConnectorConfig.java   |  20 +---
 .../generated/resources/camel-aws2-sns-sink.json   |  35 +++---
 .../docs/camel-aws2-sns-kafka-sink-connector.adoc  |   9 +-
 .../aws2sns/CamelAws2snsSinkConnectorConfig.java   |  28 ++---
 .../generated/resources/camel-aws2-sqs-sink.json   |  31 +----
 .../generated/resources/camel-aws2-sqs-source.json |  31 +----
 .../docs/camel-aws2-sqs-kafka-sink-connector.adoc  |   7 +-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |   7 +-
 .../aws2sqs/CamelAws2sqsSinkConnectorConfig.java   |  20 +---
 .../aws2sqs/CamelAws2sqsSourceConnectorConfig.java |  20 +---
 .../generated/resources/camel-aws2-sts-sink.json   |  31 +----
 .../docs/camel-aws2-sts-kafka-sink-connector.adoc  |   7 +-
 .../aws2sts/CamelAws2stsSinkConnectorConfig.java   |  20 +---
 .../resources/camel-aws2-translate-sink.json       |  31 +----
 .../camel-aws2-translate-kafka-sink-connector.adoc |   7 +-
 .../CamelAws2translateSinkConnectorConfig.java     |  20 +---
 .../generated/resources/camel-azure-blob-sink.json |  17 +--
 .../resources/camel-azure-blob-source.json         |  17 +--
 .../camel-azure-blob-kafka-sink-connector.adoc     |   5 +-
 .../camel-azure-blob-kafka-source-connector.adoc   |   5 +-
 .../CamelAzureblobSinkConnectorConfig.java         |  12 +-
 .../CamelAzureblobSourceConnectorConfig.java       |  12 +-
 .../resources/camel-azure-eventhubs-sink.json      |  17 +--
 .../resources/camel-azure-eventhubs-source.json    |  17 +--
 ...camel-azure-eventhubs-kafka-sink-connector.adoc |   5 +-
 ...mel-azure-eventhubs-kafka-source-connector.adoc |   5 +-
 .../CamelAzureeventhubsSinkConnectorConfig.java    |  12 +-
 .../CamelAzureeventhubsSourceConnectorConfig.java  |  12 +-
 .../resources/camel-azure-queue-sink.json          |  17 +--
 .../resources/camel-azure-queue-source.json        |  17 +--
 .../camel-azure-queue-kafka-sink-connector.adoc    |   5 +-
 .../camel-azure-queue-kafka-source-connector.adoc  |   5 +-
 .../CamelAzurequeueSinkConnectorConfig.java        |  12 +-
 .../CamelAzurequeueSourceConnectorConfig.java      |  12 +-
 .../resources/camel-azure-storage-blob-sink.json   |  17 +--
 .../resources/camel-azure-storage-blob-source.json |  17 +--
 ...el-azure-storage-blob-kafka-sink-connector.adoc |   5 +-
 ...-azure-storage-blob-kafka-source-connector.adoc |   5 +-
 .../CamelAzurestorageblobSinkConnectorConfig.java  |  12 +-
 ...CamelAzurestorageblobSourceConnectorConfig.java |  12 +-
 .../resources/camel-azure-storage-queue-sink.json  |  17 +--
 .../camel-azure-storage-queue-source.json          |  17 +--
 ...l-azure-storage-queue-kafka-sink-connector.adoc |   5 +-
 ...azure-storage-queue-kafka-source-connector.adoc |   5 +-
 .../CamelAzurestoragequeueSinkConnectorConfig.java |  12 +-
 ...amelAzurestoragequeueSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-bean-sink.json   |  17 +--
 .../main/docs/camel-bean-kafka-sink-connector.adoc |   5 +-
 .../bean/CamelBeanSinkConnectorConfig.java         |  12 +-
 .../generated/resources/camel-beanstalk-sink.json  |  17 +--
 .../resources/camel-beanstalk-source.json          |  17 +--
 .../docs/camel-beanstalk-kafka-sink-connector.adoc |   5 +-
 .../camel-beanstalk-kafka-source-connector.adoc    |   5 +-
 .../CamelBeanstalkSinkConnectorConfig.java         |  12 +-
 .../CamelBeanstalkSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-box-sink.json    |  17 +--
 .../src/generated/resources/camel-box-source.json  |  17 +--
 .../main/docs/camel-box-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-box-kafka-source-connector.adoc     |   5 +-
 .../box/CamelBoxSinkConnectorConfig.java           |  12 +-
 .../box/CamelBoxSourceConnectorConfig.java         |  12 +-
 .../generated/resources/camel-braintree-sink.json  |  17 +--
 .../docs/camel-braintree-kafka-sink-connector.adoc |   5 +-
 .../CamelBraintreeSinkConnectorConfig.java         |  12 +-
 .../resources/camel-caffeine-cache-sink.json       |  17 +--
 .../camel-caffeine-cache-kafka-sink-connector.adoc |   5 +-
 .../CamelCaffeinecacheSinkConnectorConfig.java     |  12 +-
 .../resources/camel-caffeine-loadcache-sink.json   |  17 +--
 ...el-caffeine-loadcache-kafka-sink-connector.adoc |   5 +-
 .../CamelCaffeineloadcacheSinkConnectorConfig.java |  12 +-
 .../generated/resources/camel-chatscript-sink.json |  17 +--
 .../camel-chatscript-kafka-sink-connector.adoc     |   5 +-
 .../CamelChatscriptSinkConnectorConfig.java        |  12 +-
 .../src/generated/resources/camel-chunk-sink.json  |  17 +--
 .../docs/camel-chunk-kafka-sink-connector.adoc     |   5 +-
 .../chunk/CamelChunkSinkConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-cm-sms-sink.json |  17 +--
 .../docs/camel-cm-sms-kafka-sink-connector.adoc    |   5 +-
 .../cmsms/CamelCmsmsSinkConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-cmis-sink.json   |  17 +--
 .../src/generated/resources/camel-cmis-source.json |  17 +--
 .../main/docs/camel-cmis-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-cmis-kafka-source-connector.adoc    |   5 +-
 .../cmis/CamelCmisSinkConnectorConfig.java         |  12 +-
 .../cmis/CamelCmisSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-coap-sink.json   |  17 +--
 .../src/generated/resources/camel-coap-source.json |  17 +--
 .../main/docs/camel-coap-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-coap-kafka-source-connector.adoc    |   5 +-
 .../coap/CamelCoapSinkConnectorConfig.java         |  12 +-
 .../coap/CamelCoapSourceConnectorConfig.java       |  12 +-
 .../generated/resources/camel-coap+tcp-sink.json   |  17 +--
 .../generated/resources/camel-coap+tcp-source.json |  17 +--
 .../docs/camel-coap+tcp-kafka-sink-connector.adoc  |   5 +-
 .../camel-coap+tcp-kafka-source-connector.adoc     |   5 +-
 .../coaptcp/CamelCoaptcpSinkConnectorConfig.java   |  12 +-
 .../coaptcp/CamelCoaptcpSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-coaps-sink.json  |  17 +--
 .../generated/resources/camel-coaps-source.json    |  17 +--
 .../docs/camel-coaps-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-coaps-kafka-source-connector.adoc   |   5 +-
 .../coaps/CamelCoapsSinkConnectorConfig.java       |  12 +-
 .../coaps/CamelCoapsSourceConnectorConfig.java     |  12 +-
 .../generated/resources/camel-coaps+tcp-sink.json  |  17 +--
 .../resources/camel-coaps+tcp-source.json          |  17 +--
 .../docs/camel-coaps+tcp-kafka-sink-connector.adoc |   5 +-
 .../camel-coaps+tcp-kafka-source-connector.adoc    |   5 +-
 .../coapstcp/CamelCoapstcpSinkConnectorConfig.java |  12 +-
 .../CamelCoapstcpSourceConnectorConfig.java        |  12 +-
 .../src/generated/resources/camel-cometd-sink.json |  17 +--
 .../generated/resources/camel-cometd-source.json   |  17 +--
 .../docs/camel-cometd-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-cometd-kafka-source-connector.adoc  |   5 +-
 .../cometd/CamelCometdSinkConnectorConfig.java     |  12 +-
 .../cometd/CamelCometdSourceConnectorConfig.java   |  12 +-
 .../generated/resources/camel-cometds-sink.json    |  17 +--
 .../generated/resources/camel-cometds-source.json  |  17 +--
 .../docs/camel-cometds-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-cometds-kafka-source-connector.adoc |   5 +-
 .../cometds/CamelCometdsSinkConnectorConfig.java   |  12 +-
 .../cometds/CamelCometdsSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-consul-sink.json |  17 +--
 .../generated/resources/camel-consul-source.json   |  17 +--
 .../docs/camel-consul-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-consul-kafka-source-connector.adoc  |   5 +-
 .../consul/CamelConsulSinkConnectorConfig.java     |  12 +-
 .../consul/CamelConsulSourceConnectorConfig.java   |  12 +-
 .../generated/resources/camel-controlbus-sink.json |  17 +--
 .../camel-controlbus-kafka-sink-connector.adoc     |   5 +-
 .../CamelControlbusSinkConnectorConfig.java        |  12 +-
 .../src/generated/resources/camel-corda-sink.json  |  17 +--
 .../generated/resources/camel-corda-source.json    |  17 +--
 .../docs/camel-corda-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-corda-kafka-source-connector.adoc   |   5 +-
 .../corda/CamelCordaSinkConnectorConfig.java       |  12 +-
 .../corda/CamelCordaSourceConnectorConfig.java     |  12 +-
 .../generated/resources/camel-couchbase-sink.json  |  18 +--
 .../resources/camel-couchbase-source.json          |  25 +++--
 .../docs/camel-couchbase-kafka-sink-connector.adoc |   4 +-
 .../camel-couchbase-kafka-source-connector.adoc    |   7 +-
 .../CamelCouchbaseSinkConnectorConfig.java         |  16 +--
 .../CamelCouchbaseSourceConnectorConfig.java       |  20 ++--
 .../generated/resources/camel-couchdb-sink.json    |  17 +--
 .../generated/resources/camel-couchdb-source.json  |  17 +--
 .../docs/camel-couchdb-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-couchdb-kafka-source-connector.adoc |   5 +-
 .../couchdb/CamelCouchdbSinkConnectorConfig.java   |  12 +-
 .../couchdb/CamelCouchdbSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-cql-sink.json    |  17 +--
 .../src/generated/resources/camel-cql-source.json  |  17 +--
 .../main/docs/camel-cql-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-cql-kafka-source-connector.adoc     |   5 +-
 .../cql/CamelCqlSinkConnectorConfig.java           |  12 +-
 .../cql/CamelCqlSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-cron-source.json |  17 +--
 .../docs/camel-cron-kafka-source-connector.adoc    |   5 +-
 .../cron/CamelCronSourceConnectorConfig.java       |  12 +-
 .../generated/resources/camel-crypto-cms-sink.json |  17 +--
 .../camel-crypto-cms-kafka-sink-connector.adoc     |   5 +-
 .../CamelCryptocmsSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-crypto-sink.json |  17 +--
 .../docs/camel-crypto-kafka-sink-connector.adoc    |   5 +-
 .../crypto/CamelCryptoSinkConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-cxf-sink.json    |  17 +--
 .../src/generated/resources/camel-cxf-source.json  |  17 +--
 .../main/docs/camel-cxf-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-cxf-kafka-source-connector.adoc     |   5 +-
 .../cxf/CamelCxfSinkConnectorConfig.java           |  12 +-
 .../cxf/CamelCxfSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-cxfrs-sink.json  |  17 +--
 .../generated/resources/camel-cxfrs-source.json    |  17 +--
 .../docs/camel-cxfrs-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-cxfrs-kafka-source-connector.adoc   |   5 +-
 .../cxfrs/CamelCxfrsSinkConnectorConfig.java       |  12 +-
 .../cxfrs/CamelCxfrsSourceConnectorConfig.java     |  12 +-
 .../generated/resources/camel-dataformat-sink.json |  17 +--
 .../camel-dataformat-kafka-sink-connector.adoc     |   5 +-
 .../CamelDataformatSinkConnectorConfig.java        |  12 +-
 .../src/generated/resources/camel-direct-sink.json |  17 +--
 .../generated/resources/camel-direct-source.json   |  17 +--
 .../docs/camel-direct-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-direct-kafka-source-connector.adoc  |   5 +-
 .../direct/CamelDirectSinkConnectorConfig.java     |  12 +-
 .../direct/CamelDirectSourceConnectorConfig.java   |  12 +-
 .../generated/resources/camel-direct-vm-sink.json  |  17 +--
 .../resources/camel-direct-vm-source.json          |  17 +--
 .../docs/camel-direct-vm-kafka-sink-connector.adoc |   5 +-
 .../camel-direct-vm-kafka-source-connector.adoc    |   5 +-
 .../directvm/CamelDirectvmSinkConnectorConfig.java |  12 +-
 .../CamelDirectvmSourceConnectorConfig.java        |  12 +-
 .../generated/resources/camel-disruptor-sink.json  |  17 +--
 .../resources/camel-disruptor-source.json          |  17 +--
 .../docs/camel-disruptor-kafka-sink-connector.adoc |   5 +-
 .../camel-disruptor-kafka-source-connector.adoc    |   5 +-
 .../CamelDisruptorSinkConnectorConfig.java         |  12 +-
 .../CamelDisruptorSourceConnectorConfig.java       |  12 +-
 .../resources/camel-disruptor-vm-sink.json         |  17 +--
 .../resources/camel-disruptor-vm-source.json       |  17 +--
 .../camel-disruptor-vm-kafka-sink-connector.adoc   |   5 +-
 .../camel-disruptor-vm-kafka-source-connector.adoc |   5 +-
 .../CamelDisruptorvmSinkConnectorConfig.java       |  12 +-
 .../CamelDisruptorvmSourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-djl-sink.json    |  17 +--
 .../main/docs/camel-djl-kafka-sink-connector.adoc  |   5 +-
 .../djl/CamelDjlSinkConnectorConfig.java           |  12 +-
 .../src/generated/resources/camel-dns-sink.json    |  17 +--
 .../main/docs/camel-dns-kafka-sink-connector.adoc  |   5 +-
 .../dns/CamelDnsSinkConnectorConfig.java           |  12 +-
 .../src/generated/resources/camel-docker-sink.json |  17 +--
 .../generated/resources/camel-docker-source.json   |  17 +--
 .../docs/camel-docker-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-docker-kafka-source-connector.adoc  |   5 +-
 .../docker/CamelDockerSinkConnectorConfig.java     |  12 +-
 .../docker/CamelDockerSourceConnectorConfig.java   |  12 +-
 .../src/generated/resources/camel-dozer-sink.json  |  17 +--
 .../docs/camel-dozer-kafka-sink-connector.adoc     |   5 +-
 .../dozer/CamelDozerSinkConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-drill-sink.json  |  17 +--
 .../docs/camel-drill-kafka-sink-connector.adoc     |   5 +-
 .../drill/CamelDrillSinkConnectorConfig.java       |  12 +-
 .../generated/resources/camel-dropbox-sink.json    |  17 +--
 .../generated/resources/camel-dropbox-source.json  |  17 +--
 .../docs/camel-dropbox-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-dropbox-kafka-source-connector.adoc |   5 +-
 .../dropbox/CamelDropboxSinkConnectorConfig.java   |  12 +-
 .../dropbox/CamelDropboxSourceConnectorConfig.java |  12 +-
 .../generated/resources/camel-ehcache-sink.json    |  17 +--
 .../generated/resources/camel-ehcache-source.json  |  17 +--
 .../docs/camel-ehcache-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-ehcache-kafka-source-connector.adoc |   5 +-
 .../ehcache/CamelEhcacheSinkConnectorConfig.java   |  12 +-
 .../ehcache/CamelEhcacheSourceConnectorConfig.java |  12 +-
 .../resources/camel-elasticsearch-rest-sink.json   |  17 +--
 ...el-elasticsearch-rest-kafka-sink-connector.adoc |   5 +-
 .../CamelElasticsearchrestSinkConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-elsql-sink.json  |  17 +--
 .../generated/resources/camel-elsql-source.json    |  17 +--
 .../docs/camel-elsql-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-elsql-kafka-source-connector.adoc   |   5 +-
 .../elsql/CamelElsqlSinkConnectorConfig.java       |  12 +-
 .../elsql/CamelElsqlSourceConnectorConfig.java     |  12 +-
 .../generated/resources/camel-etcd-keys-sink.json  |  17 +--
 .../docs/camel-etcd-keys-kafka-sink-connector.adoc |   5 +-
 .../etcdkeys/CamelEtcdkeysSinkConnectorConfig.java |  12 +-
 .../generated/resources/camel-etcd-stats-sink.json |  17 +--
 .../resources/camel-etcd-stats-source.json         |  17 +--
 .../camel-etcd-stats-kafka-sink-connector.adoc     |   5 +-
 .../camel-etcd-stats-kafka-source-connector.adoc   |   5 +-
 .../CamelEtcdstatsSinkConnectorConfig.java         |  12 +-
 .../CamelEtcdstatsSourceConnectorConfig.java       |  12 +-
 .../resources/camel-etcd-watch-source.json         |  17 +--
 .../camel-etcd-watch-kafka-source-connector.adoc   |   5 +-
 .../CamelEtcdwatchSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-exec-sink.json   |  17 +--
 .../main/docs/camel-exec-kafka-sink-connector.adoc |   5 +-
 .../exec/CamelExecSinkConnectorConfig.java         |  12 +-
 .../generated/resources/camel-facebook-sink.json   |  17 +--
 .../generated/resources/camel-facebook-source.json |  17 +--
 .../docs/camel-facebook-kafka-sink-connector.adoc  |   5 +-
 .../camel-facebook-kafka-source-connector.adoc     |   5 +-
 .../facebook/CamelFacebookSinkConnectorConfig.java |  12 +-
 .../CamelFacebookSourceConnectorConfig.java        |  12 +-
 .../src/generated/resources/camel-fhir-sink.json   |  17 +--
 .../src/generated/resources/camel-fhir-source.json |  17 +--
 .../main/docs/camel-fhir-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-fhir-kafka-source-connector.adoc    |   5 +-
 .../fhir/CamelFhirSinkConnectorConfig.java         |  12 +-
 .../fhir/CamelFhirSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-file-sink.json   |  17 +--
 .../src/generated/resources/camel-file-source.json |  17 +--
 .../main/docs/camel-file-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-file-kafka-source-connector.adoc    |   5 +-
 .../file/CamelFileSinkConnectorConfig.java         |  12 +-
 .../file/CamelFileSourceConnectorConfig.java       |  12 +-
 .../resources/camel-file-watch-source.json         |  17 +--
 .../camel-file-watch-kafka-source-connector.adoc   |   5 +-
 .../CamelFilewatchSourceConnectorConfig.java       |  12 +-
 .../generated/resources/camel-flatpack-sink.json   |  17 +--
 .../generated/resources/camel-flatpack-source.json |  17 +--
 .../docs/camel-flatpack-kafka-sink-connector.adoc  |   5 +-
 .../camel-flatpack-kafka-source-connector.adoc     |   5 +-
 .../flatpack/CamelFlatpackSinkConnectorConfig.java |  12 +-
 .../CamelFlatpackSourceConnectorConfig.java        |  12 +-
 .../src/generated/resources/camel-flink-sink.json  |  17 +--
 .../docs/camel-flink-kafka-sink-connector.adoc     |   5 +-
 .../flink/CamelFlinkSinkConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-fop-sink.json    |  17 +--
 .../main/docs/camel-fop-kafka-sink-connector.adoc  |   5 +-
 .../fop/CamelFopSinkConnectorConfig.java           |  12 +-
 .../generated/resources/camel-freemarker-sink.json |  17 +--
 .../camel-freemarker-kafka-sink-connector.adoc     |   5 +-
 .../CamelFreemarkerSinkConnectorConfig.java        |  12 +-
 .../src/generated/resources/camel-ftp-sink.json    |  17 +--
 .../src/generated/resources/camel-ftp-source.json  |  17 +--
 .../main/docs/camel-ftp-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-ftp-kafka-source-connector.adoc     |   5 +-
 .../ftp/CamelFtpSinkConnectorConfig.java           |  12 +-
 .../ftp/CamelFtpSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-ftps-sink.json   |  17 +--
 .../src/generated/resources/camel-ftps-source.json |  17 +--
 .../main/docs/camel-ftps-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-ftps-kafka-source-connector.adoc    |   5 +-
 .../ftps/CamelFtpsSinkConnectorConfig.java         |  12 +-
 .../ftps/CamelFtpsSourceConnectorConfig.java       |  12 +-
 .../generated/resources/camel-ganglia-sink.json    |  17 +--
 .../docs/camel-ganglia-kafka-sink-connector.adoc   |   5 +-
 .../ganglia/CamelGangliaSinkConnectorConfig.java   |  12 +-
 .../generated/resources/camel-geocoder-sink.json   |  17 +--
 .../docs/camel-geocoder-kafka-sink-connector.adoc  |   5 +-
 .../geocoder/CamelGeocoderSinkConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-git-sink.json    |  17 +--
 .../src/generated/resources/camel-git-source.json  |  17 +--
 .../main/docs/camel-git-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-git-kafka-source-connector.adoc     |   5 +-
 .../git/CamelGitSinkConnectorConfig.java           |  12 +-
 .../git/CamelGitSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-github-sink.json |  19 +---
 .../generated/resources/camel-github-source.json   | 125 +++++++++++++++++++--
 .../docs/camel-github-kafka-sink-connector.adoc    |   7 +-
 .../docs/camel-github-kafka-source-connector.adoc  |  24 +++-
 .../examples/CamelGithubSinkConnector.properties   |   2 +-
 .../examples/CamelGithubSourceConnector.properties |   2 +-
 .../github/CamelGithubSinkConnectorConfig.java     |  14 +--
 .../github/CamelGithubSourceConnectorConfig.java   |  82 ++++++++++++--
 .../resources/camel-google-bigquery-sink.json      |  21 ++--
 ...camel-google-bigquery-kafka-sink-connector.adoc |   9 +-
 .../CamelGooglebigquerySinkConnectorConfig.java    |  16 +--
 .../resources/camel-google-bigquery-sql-sink.json  |  21 ++--
 ...l-google-bigquery-sql-kafka-sink-connector.adoc |   9 +-
 .../CamelGooglebigquerysqlSinkConnectorConfig.java |  16 +--
 .../resources/camel-google-calendar-sink.json      |  17 +--
 .../resources/camel-google-calendar-source.json    |  17 +--
 ...camel-google-calendar-kafka-sink-connector.adoc |   5 +-
 ...mel-google-calendar-kafka-source-connector.adoc |   5 +-
 .../CamelGooglecalendarSinkConnectorConfig.java    |  12 +-
 .../CamelGooglecalendarSourceConnectorConfig.java  |  12 +-
 .../camel-google-calendar-stream-source.json       |  17 +--
 ...gle-calendar-stream-kafka-source-connector.adoc |   5 +-
 ...lGooglecalendarstreamSourceConnectorConfig.java |  12 +-
 .../resources/camel-google-drive-sink.json         |  17 +--
 .../resources/camel-google-drive-source.json       |  17 +--
 .../camel-google-drive-kafka-sink-connector.adoc   |   5 +-
 .../camel-google-drive-kafka-source-connector.adoc |   5 +-
 .../CamelGoogledriveSinkConnectorConfig.java       |  12 +-
 .../CamelGoogledriveSourceConnectorConfig.java     |  12 +-
 .../resources/camel-google-mail-sink.json          |  17 +--
 .../resources/camel-google-mail-source.json        |  17 +--
 .../camel-google-mail-kafka-sink-connector.adoc    |   5 +-
 .../camel-google-mail-kafka-source-connector.adoc  |   5 +-
 .../CamelGooglemailSinkConnectorConfig.java        |  12 +-
 .../CamelGooglemailSourceConnectorConfig.java      |  12 +-
 .../resources/camel-google-mail-stream-source.json |  17 +--
 ...-google-mail-stream-kafka-source-connector.adoc |   5 +-
 ...CamelGooglemailstreamSourceConnectorConfig.java |  12 +-
 .../resources/camel-google-pubsub-sink.json        |  17 ++-
 .../resources/camel-google-pubsub-source.json      |  17 +--
 .../camel-google-pubsub-kafka-sink-connector.adoc  |   4 +-
 ...camel-google-pubsub-kafka-source-connector.adoc |   5 +-
 .../CamelGooglepubsubSinkConnectorConfig.java      |  16 +--
 .../CamelGooglepubsubSourceConnectorConfig.java    |  12 +-
 .../resources/camel-google-sheets-sink.json        |  17 +--
 .../resources/camel-google-sheets-source.json      |  17 +--
 .../camel-google-sheets-kafka-sink-connector.adoc  |   5 +-
 ...camel-google-sheets-kafka-source-connector.adoc |   5 +-
 .../CamelGooglesheetsSinkConnectorConfig.java      |  12 +-
 .../CamelGooglesheetsSourceConnectorConfig.java    |  12 +-
 .../camel-google-sheets-stream-source.json         |  17 +--
 ...oogle-sheets-stream-kafka-source-connector.adoc |   5 +-
 ...melGooglesheetsstreamSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-gora-sink.json   |  17 +--
 .../src/generated/resources/camel-gora-source.json |  17 +--
 .../main/docs/camel-gora-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-gora-kafka-source-connector.adoc    |   5 +-
 .../gora/CamelGoraSinkConnectorConfig.java         |  12 +-
 .../gora/CamelGoraSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-grape-sink.json  |  17 +--
 .../docs/camel-grape-kafka-sink-connector.adoc     |   5 +-
 .../grape/CamelGrapeSinkConnectorConfig.java       |  12 +-
 .../generated/resources/camel-graphql-sink.json    |  17 +--
 .../docs/camel-graphql-kafka-sink-connector.adoc   |   5 +-
 .../graphql/CamelGraphqlSinkConnectorConfig.java   |  12 +-
 .../src/generated/resources/camel-grpc-sink.json   |  17 +--
 .../src/generated/resources/camel-grpc-source.json |  17 +--
 .../main/docs/camel-grpc-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-grpc-kafka-source-connector.adoc    |   5 +-
 .../grpc/CamelGrpcSinkConnectorConfig.java         |  12 +-
 .../grpc/CamelGrpcSourceConnectorConfig.java       |  12 +-
 .../resources/camel-guava-eventbus-sink.json       |  17 +--
 .../resources/camel-guava-eventbus-source.json     |  17 +--
 .../camel-guava-eventbus-kafka-sink-connector.adoc |   5 +-
 ...amel-guava-eventbus-kafka-source-connector.adoc |   5 +-
 .../CamelGuavaeventbusSinkConnectorConfig.java     |  12 +-
 .../CamelGuavaeventbusSourceConnectorConfig.java   |  12 +-
 .../camel-hazelcast-atomicvalue-sink.json          |  17 +--
 ...hazelcast-atomicvalue-kafka-sink-connector.adoc |   5 +-
 ...melHazelcastatomicvalueSinkConnectorConfig.java |  12 +-
 .../resources/camel-hazelcast-instance-source.json |  17 +--
 ...-hazelcast-instance-kafka-source-connector.adoc |   5 +-
 ...amelHazelcastinstanceSourceConnectorConfig.java |  12 +-
 .../resources/camel-hazelcast-list-sink.json       |  17 +--
 .../resources/camel-hazelcast-list-source.json     |  17 +--
 .../camel-hazelcast-list-kafka-sink-connector.adoc |   5 +-
 ...amel-hazelcast-list-kafka-source-connector.adoc |   5 +-
 .../CamelHazelcastlistSinkConnectorConfig.java     |  12 +-
 .../CamelHazelcastlistSourceConnectorConfig.java   |  12 +-
 .../resources/camel-hazelcast-map-sink.json        |  17 +--
 .../resources/camel-hazelcast-map-source.json      |  17 +--
 .../camel-hazelcast-map-kafka-sink-connector.adoc  |   5 +-
 ...camel-hazelcast-map-kafka-source-connector.adoc |   5 +-
 .../CamelHazelcastmapSinkConnectorConfig.java      |  12 +-
 .../CamelHazelcastmapSourceConnectorConfig.java    |  12 +-
 .../resources/camel-hazelcast-multimap-sink.json   |  17 +--
 .../resources/camel-hazelcast-multimap-source.json |  17 +--
 ...el-hazelcast-multimap-kafka-sink-connector.adoc |   5 +-
 ...-hazelcast-multimap-kafka-source-connector.adoc |   5 +-
 .../CamelHazelcastmultimapSinkConnectorConfig.java |  12 +-
 ...amelHazelcastmultimapSourceConnectorConfig.java |  12 +-
 .../resources/camel-hazelcast-queue-sink.json      |  17 +--
 .../resources/camel-hazelcast-queue-source.json    |  17 +--
 ...camel-hazelcast-queue-kafka-sink-connector.adoc |   5 +-
 ...mel-hazelcast-queue-kafka-source-connector.adoc |   5 +-
 .../CamelHazelcastqueueSinkConnectorConfig.java    |  12 +-
 .../CamelHazelcastqueueSourceConnectorConfig.java  |  12 +-
 .../camel-hazelcast-replicatedmap-sink.json        |  17 +--
 .../camel-hazelcast-replicatedmap-source.json      |  17 +--
 ...zelcast-replicatedmap-kafka-sink-connector.adoc |   5 +-
 ...lcast-replicatedmap-kafka-source-connector.adoc |   5 +-
 ...lHazelcastreplicatedmapSinkConnectorConfig.java |  12 +-
 ...azelcastreplicatedmapSourceConnectorConfig.java |  12 +-
 .../resources/camel-hazelcast-ringbuffer-sink.json |  17 +--
 ...-hazelcast-ringbuffer-kafka-sink-connector.adoc |   5 +-
 ...amelHazelcastringbufferSinkConnectorConfig.java |  12 +-
 .../resources/camel-hazelcast-seda-sink.json       |  17 +--
 .../resources/camel-hazelcast-seda-source.json     |  17 +--
 .../camel-hazelcast-seda-kafka-sink-connector.adoc |   5 +-
 ...amel-hazelcast-seda-kafka-source-connector.adoc |   5 +-
 .../CamelHazelcastsedaSinkConnectorConfig.java     |  12 +-
 .../CamelHazelcastsedaSourceConnectorConfig.java   |  12 +-
 .../resources/camel-hazelcast-set-sink.json        |  17 +--
 .../resources/camel-hazelcast-set-source.json      |  17 +--
 .../camel-hazelcast-set-kafka-sink-connector.adoc  |   5 +-
 ...camel-hazelcast-set-kafka-source-connector.adoc |   5 +-
 .../CamelHazelcastsetSinkConnectorConfig.java      |  12 +-
 .../CamelHazelcastsetSourceConnectorConfig.java    |  12 +-
 .../resources/camel-hazelcast-topic-sink.json      |  17 +--
 .../resources/camel-hazelcast-topic-source.json    |  17 +--
 ...camel-hazelcast-topic-kafka-sink-connector.adoc |   5 +-
 ...mel-hazelcast-topic-kafka-source-connector.adoc |   5 +-
 .../CamelHazelcasttopicSinkConnectorConfig.java    |  12 +-
 .../CamelHazelcasttopicSourceConnectorConfig.java  |  12 +-
 .../src/generated/resources/camel-hbase-sink.json  |  17 +--
 .../generated/resources/camel-hbase-source.json    |  17 +--
 .../docs/camel-hbase-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-hbase-kafka-source-connector.adoc   |   5 +-
 .../hbase/CamelHbaseSinkConnectorConfig.java       |  12 +-
 .../hbase/CamelHbaseSourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-hdfs-sink.json   |  17 +--
 .../src/generated/resources/camel-hdfs-source.json |  17 +--
 .../main/docs/camel-hdfs-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-hdfs-kafka-source-connector.adoc    |   5 +-
 .../hdfs/CamelHdfsSinkConnectorConfig.java         |  12 +-
 .../hdfs/CamelHdfsSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-http-sink.json   |  17 +--
 .../main/docs/camel-http-kafka-sink-connector.adoc |   5 +-
 .../http/CamelHttpSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-https-sink.json  |  17 +--
 .../docs/camel-https-kafka-sink-connector.adoc     |   5 +-
 .../https/CamelHttpsSinkConnectorConfig.java       |  12 +-
 .../resources/camel-iec60870-client-sink.json      |  17 +--
 .../resources/camel-iec60870-client-source.json    |  17 +--
 ...camel-iec60870-client-kafka-sink-connector.adoc |   5 +-
 ...mel-iec60870-client-kafka-source-connector.adoc |   5 +-
 .../CamelIec60870clientSinkConnectorConfig.java    |  12 +-
 .../CamelIec60870clientSourceConnectorConfig.java  |  12 +-
 .../resources/camel-iec60870-server-sink.json      |  17 +--
 .../resources/camel-iec60870-server-source.json    |  17 +--
 ...camel-iec60870-server-kafka-sink-connector.adoc |   5 +-
 ...mel-iec60870-server-kafka-source-connector.adoc |   5 +-
 .../CamelIec60870serverSinkConnectorConfig.java    |  12 +-
 .../CamelIec60870serverSourceConnectorConfig.java  |  12 +-
 .../resources/camel-ignite-cache-sink.json         |  17 +--
 .../resources/camel-ignite-cache-source.json       |  17 +--
 .../camel-ignite-cache-kafka-sink-connector.adoc   |   5 +-
 .../camel-ignite-cache-kafka-source-connector.adoc |   5 +-
 .../CamelIgnitecacheSinkConnectorConfig.java       |  12 +-
 .../CamelIgnitecacheSourceConnectorConfig.java     |  12 +-
 .../resources/camel-ignite-compute-sink.json       |  17 +--
 .../camel-ignite-compute-kafka-sink-connector.adoc |   5 +-
 .../CamelIgnitecomputeSinkConnectorConfig.java     |  12 +-
 .../resources/camel-ignite-events-source.json      |  17 +--
 ...camel-ignite-events-kafka-source-connector.adoc |   5 +-
 .../CamelIgniteeventsSourceConnectorConfig.java    |  12 +-
 .../resources/camel-ignite-idgen-sink.json         |  17 +--
 .../camel-ignite-idgen-kafka-sink-connector.adoc   |   5 +-
 .../CamelIgniteidgenSinkConnectorConfig.java       |  12 +-
 .../resources/camel-ignite-messaging-sink.json     |  17 +--
 .../resources/camel-ignite-messaging-source.json   |  17 +--
 ...amel-ignite-messaging-kafka-sink-connector.adoc |   5 +-
 ...el-ignite-messaging-kafka-source-connector.adoc |   5 +-
 .../CamelIgnitemessagingSinkConnectorConfig.java   |  12 +-
 .../CamelIgnitemessagingSourceConnectorConfig.java |  12 +-
 .../resources/camel-ignite-queue-sink.json         |  17 +--
 .../camel-ignite-queue-kafka-sink-connector.adoc   |   5 +-
 .../CamelIgnitequeueSinkConnectorConfig.java       |  12 +-
 .../generated/resources/camel-ignite-set-sink.json |  17 +--
 .../camel-ignite-set-kafka-sink-connector.adoc     |   5 +-
 .../CamelIgnitesetSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-imap-sink.json   |  17 +--
 .../src/generated/resources/camel-imap-source.json |  17 +--
 .../main/docs/camel-imap-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-imap-kafka-source-connector.adoc    |   5 +-
 .../imap/CamelImapSinkConnectorConfig.java         |  12 +-
 .../imap/CamelImapSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-imaps-sink.json  |  17 +--
 .../generated/resources/camel-imaps-source.json    |  17 +--
 .../docs/camel-imaps-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-imaps-kafka-source-connector.adoc   |   5 +-
 .../imaps/CamelImapsSinkConnectorConfig.java       |  12 +-
 .../imaps/CamelImapsSourceConnectorConfig.java     |  12 +-
 .../generated/resources/camel-infinispan-sink.json |  17 +--
 .../resources/camel-infinispan-source.json         |  17 +--
 .../camel-infinispan-kafka-sink-connector.adoc     |   5 +-
 .../camel-infinispan-kafka-source-connector.adoc   |   5 +-
 .../CamelInfinispanSinkConnectorConfig.java        |  12 +-
 .../CamelInfinispanSourceConnectorConfig.java      |  12 +-
 .../generated/resources/camel-influxdb-sink.json   |  17 +--
 .../docs/camel-influxdb-kafka-sink-connector.adoc  |   5 +-
 .../influxdb/CamelInfluxdbSinkConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-iota-sink.json   |  17 +--
 .../main/docs/camel-iota-kafka-sink-connector.adoc |   5 +-
 .../iota/CamelIotaSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-ipfs-sink.json   |  17 +--
 .../main/docs/camel-ipfs-kafka-sink-connector.adoc |   5 +-
 .../ipfs/CamelIpfsSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-irc-sink.json    |  17 +--
 .../src/generated/resources/camel-irc-source.json  |  17 +--
 .../main/docs/camel-irc-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-irc-kafka-source-connector.adoc     |   5 +-
 .../irc/CamelIrcSinkConnectorConfig.java           |  12 +-
 .../irc/CamelIrcSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-ironmq-sink.json |  17 +--
 .../generated/resources/camel-ironmq-source.json   |  17 +--
 .../docs/camel-ironmq-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-ironmq-kafka-source-connector.adoc  |   5 +-
 .../ironmq/CamelIronmqSinkConnectorConfig.java     |  12 +-
 .../ironmq/CamelIronmqSourceConnectorConfig.java   |  12 +-
 .../src/generated/resources/camel-jbpm-sink.json   |  17 +--
 .../src/generated/resources/camel-jbpm-source.json |  17 +--
 .../main/docs/camel-jbpm-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-jbpm-kafka-source-connector.adoc    |   5 +-
 .../jbpm/CamelJbpmSinkConnectorConfig.java         |  12 +-
 .../jbpm/CamelJbpmSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-jcache-sink.json |  17 +--
 .../generated/resources/camel-jcache-source.json   |  17 +--
 .../docs/camel-jcache-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-jcache-kafka-source-connector.adoc  |   5 +-
 .../jcache/CamelJcacheSinkConnectorConfig.java     |  12 +-
 .../jcache/CamelJcacheSourceConnectorConfig.java   |  12 +-
 .../generated/resources/camel-jclouds-sink.json    |  17 +--
 .../generated/resources/camel-jclouds-source.json  |  17 +--
 .../docs/camel-jclouds-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-jclouds-kafka-source-connector.adoc |   5 +-
 .../jclouds/CamelJcloudsSinkConnectorConfig.java   |  12 +-
 .../jclouds/CamelJcloudsSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-jcr-sink.json    |  17 +--
 .../src/generated/resources/camel-jcr-source.json  |  17 +--
 .../main/docs/camel-jcr-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-jcr-kafka-source-connector.adoc     |   5 +-
 .../jcr/CamelJcrSinkConnectorConfig.java           |  12 +-
 .../jcr/CamelJcrSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-jdbc-sink.json   |  17 +--
 .../main/docs/camel-jdbc-kafka-sink-connector.adoc |   5 +-
 .../jdbc/CamelJdbcSinkConnectorConfig.java         |  12 +-
 .../generated/resources/camel-jetty-source.json    |  31 ++---
 .../docs/camel-jetty-kafka-source-connector.adoc   |   7 +-
 .../jetty/CamelJettySourceConnectorConfig.java     |  20 ++--
 .../generated/resources/camel-jgroups-sink.json    |  17 +--
 .../generated/resources/camel-jgroups-source.json  |  17 +--
 .../docs/camel-jgroups-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-jgroups-kafka-source-connector.adoc |   5 +-
 .../jgroups/CamelJgroupsSinkConnectorConfig.java   |  12 +-
 .../jgroups/CamelJgroupsSourceConnectorConfig.java |  12 +-
 .../resources/camel-jgroups-raft-sink.json         |  17 +--
 .../resources/camel-jgroups-raft-source.json       |  17 +--
 .../camel-jgroups-raft-kafka-sink-connector.adoc   |   5 +-
 .../camel-jgroups-raft-kafka-source-connector.adoc |   5 +-
 .../CamelJgroupsraftSinkConnectorConfig.java       |  12 +-
 .../CamelJgroupsraftSourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-jing-sink.json   |  17 +--
 .../main/docs/camel-jing-kafka-sink-connector.adoc |   5 +-
 .../jing/CamelJingSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-jira-sink.json   |  17 +--
 .../src/generated/resources/camel-jira-source.json |  17 +--
 .../main/docs/camel-jira-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-jira-kafka-source-connector.adoc    |   5 +-
 .../jira/CamelJiraSinkConnectorConfig.java         |  12 +-
 .../jira/CamelJiraSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-jms-sink.json    |  17 +--
 .../src/generated/resources/camel-jms-source.json  |  17 +--
 .../main/docs/camel-jms-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-jms-kafka-source-connector.adoc     |   5 +-
 .../jms/CamelJmsSinkConnectorConfig.java           |  12 +-
 .../jms/CamelJmsSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-jmx-source.json  |  17 +--
 .../docs/camel-jmx-kafka-source-connector.adoc     |   5 +-
 .../jmx/CamelJmxSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-jolt-sink.json   |  17 +--
 .../main/docs/camel-jolt-kafka-sink-connector.adoc |   5 +-
 .../jolt/CamelJoltSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-jooq-sink.json   |  17 +--
 .../src/generated/resources/camel-jooq-source.json |  17 +--
 .../main/docs/camel-jooq-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-jooq-kafka-source-connector.adoc    |   5 +-
 .../jooq/CamelJooqSinkConnectorConfig.java         |  12 +-
 .../jooq/CamelJooqSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-jpa-sink.json    |  17 +--
 .../src/generated/resources/camel-jpa-source.json  |  17 +--
 .../main/docs/camel-jpa-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-jpa-kafka-source-connector.adoc     |   5 +-
 .../jpa/CamelJpaSinkConnectorConfig.java           |  12 +-
 .../jpa/CamelJpaSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-jslt-sink.json   |  17 +--
 .../main/docs/camel-jslt-kafka-sink-connector.adoc |   5 +-
 .../jslt/CamelJsltSinkConnectorConfig.java         |  12 +-
 .../resources/camel-json-validator-sink.json       |  17 +--
 .../camel-json-validator-kafka-sink-connector.adoc |   5 +-
 .../CamelJsonvalidatorSinkConnectorConfig.java     |  12 +-
 .../generated/resources/camel-jsonata-sink.json    |  17 +--
 .../docs/camel-jsonata-kafka-sink-connector.adoc   |   5 +-
 .../jsonata/CamelJsonataSinkConnectorConfig.java   |  12 +-
 .../src/generated/resources/camel-jt400-sink.json  |  17 +--
 .../generated/resources/camel-jt400-source.json    |  17 +--
 .../docs/camel-jt400-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-jt400-kafka-source-connector.adoc   |   5 +-
 .../jt400/CamelJt400SinkConnectorConfig.java       |  12 +-
 .../jt400/CamelJt400SourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-kafka-sink.json  |  17 +--
 .../generated/resources/camel-kafka-source.json    |  17 +--
 .../docs/camel-kafka-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-kafka-kafka-source-connector.adoc   |   5 +-
 .../kafka/CamelKafkaSinkConnectorConfig.java       |  12 +-
 .../kafka/CamelKafkaSourceConnectorConfig.java     |  12 +-
 .../camel-kubernetes-config-maps-sink.json         |  17 +--
 ...ubernetes-config-maps-kafka-sink-connector.adoc |   5 +-
 ...melKubernetesconfigmapsSinkConnectorConfig.java |  12 +-
 .../camel-kubernetes-custom-resources-sink.json    |  19 +---
 .../camel-kubernetes-custom-resources-source.json  |  19 +---
 ...etes-custom-resources-kafka-sink-connector.adoc |   9 +-
 ...es-custom-resources-kafka-source-connector.adoc |   9 +-
 ...bernetescustomresourcesSinkConnectorConfig.java |  12 +-
 ...rnetescustomresourcesSourceConnectorConfig.java |  12 +-
 .../camel-kubernetes-deployments-sink.json         |  17 +--
 .../camel-kubernetes-deployments-source.json       |  17 +--
 ...ubernetes-deployments-kafka-sink-connector.adoc |   5 +-
 ...ernetes-deployments-kafka-source-connector.adoc |   5 +-
 ...elKubernetesdeploymentsSinkConnectorConfig.java |  12 +-
 ...KubernetesdeploymentsSourceConnectorConfig.java |  12 +-
 .../resources/camel-kubernetes-hpa-sink.json       |  17 +--
 .../resources/camel-kubernetes-hpa-source.json     |  17 +--
 .../camel-kubernetes-hpa-kafka-sink-connector.adoc |   5 +-
 ...amel-kubernetes-hpa-kafka-source-connector.adoc |   5 +-
 .../CamelKuberneteshpaSinkConnectorConfig.java     |  12 +-
 .../CamelKuberneteshpaSourceConnectorConfig.java   |  12 +-
 .../resources/camel-kubernetes-job-sink.json       |  17 +--
 .../resources/camel-kubernetes-job-source.json     |  17 +--
 .../camel-kubernetes-job-kafka-sink-connector.adoc |   5 +-
 ...amel-kubernetes-job-kafka-source-connector.adoc |   5 +-
 .../CamelKubernetesjobSinkConnectorConfig.java     |  12 +-
 .../CamelKubernetesjobSourceConnectorConfig.java   |  12 +-
 .../camel-kubernetes-namespaces-sink.json          |  17 +--
 .../camel-kubernetes-namespaces-source.json        |  17 +--
 ...kubernetes-namespaces-kafka-sink-connector.adoc |   5 +-
 ...bernetes-namespaces-kafka-source-connector.adoc |   5 +-
 ...melKubernetesnamespacesSinkConnectorConfig.java |  12 +-
 ...lKubernetesnamespacesSourceConnectorConfig.java |  12 +-
 .../resources/camel-kubernetes-nodes-sink.json     |  17 +--
 .../resources/camel-kubernetes-nodes-source.json   |  17 +--
 ...amel-kubernetes-nodes-kafka-sink-connector.adoc |   5 +-
 ...el-kubernetes-nodes-kafka-source-connector.adoc |   5 +-
 .../CamelKubernetesnodesSinkConnectorConfig.java   |  12 +-
 .../CamelKubernetesnodesSourceConnectorConfig.java |  12 +-
 ...-kubernetes-persistent-volumes-claims-sink.json |  17 +--
 ...istent-volumes-claims-kafka-sink-connector.adoc |   5 +-
 ...persistentvolumesclaimsSinkConnectorConfig.java |  12 +-
 .../camel-kubernetes-persistent-volumes-sink.json  |  17 +--
 ...es-persistent-volumes-kafka-sink-connector.adoc |   5 +-
 ...rnetespersistentvolumesSinkConnectorConfig.java |  12 +-
 .../resources/camel-kubernetes-pods-sink.json      |  17 +--
 .../resources/camel-kubernetes-pods-source.json    |  17 +--
 ...camel-kubernetes-pods-kafka-sink-connector.adoc |   5 +-
 ...mel-kubernetes-pods-kafka-source-connector.adoc |   5 +-
 .../CamelKubernetespodsSinkConnectorConfig.java    |  12 +-
 .../CamelKubernetespodsSourceConnectorConfig.java  |  12 +-
 ...el-kubernetes-replication-controllers-sink.json |  17 +--
 ...-kubernetes-replication-controllers-source.json |  17 +--
 ...plication-controllers-kafka-sink-connector.adoc |   5 +-
 ...ication-controllers-kafka-source-connector.adoc |   5 +-
 ...sreplicationcontrollersSinkConnectorConfig.java |  12 +-
 ...eplicationcontrollersSourceConnectorConfig.java |  12 +-
 .../camel-kubernetes-resources-quota-sink.json     |  17 +--
 ...netes-resources-quota-kafka-sink-connector.adoc |   5 +-
 ...ubernetesresourcesquotaSinkConnectorConfig.java |  12 +-
 .../resources/camel-kubernetes-secrets-sink.json   |  17 +--
 ...el-kubernetes-secrets-kafka-sink-connector.adoc |   5 +-
 .../CamelKubernetessecretsSinkConnectorConfig.java |  12 +-
 .../camel-kubernetes-service-accounts-sink.json    |  17 +--
 ...etes-service-accounts-kafka-sink-connector.adoc |   5 +-
 ...bernetesserviceaccountsSinkConnectorConfig.java |  12 +-
 .../resources/camel-kubernetes-services-sink.json  |  17 +--
 .../camel-kubernetes-services-source.json          |  17 +--
 ...l-kubernetes-services-kafka-sink-connector.adoc |   5 +-
 ...kubernetes-services-kafka-source-connector.adoc |   5 +-
 ...CamelKubernetesservicesSinkConnectorConfig.java |  12 +-
 ...melKubernetesservicesSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-kudu-sink.json   |  17 +--
 .../main/docs/camel-kudu-kafka-sink-connector.adoc |   5 +-
 .../kudu/CamelKuduSinkConnectorConfig.java         |  12 +-
 .../generated/resources/camel-language-sink.json   |  17 +--
 .../docs/camel-language-kafka-sink-connector.adoc  |   5 +-
 .../language/CamelLanguageSinkConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-ldap-sink.json   |  17 +--
 .../main/docs/camel-ldap-kafka-sink-connector.adoc |   5 +-
 .../ldap/CamelLdapSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-ldif-sink.json   |  17 +--
 .../main/docs/camel-ldif-kafka-sink-connector.adoc |   5 +-
 .../ldif/CamelLdifSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-log-sink.json    |  17 +--
 .../main/docs/camel-log-kafka-sink-connector.adoc  |   5 +-
 .../log/CamelLogSinkConnectorConfig.java           |  12 +-
 .../src/generated/resources/camel-lpr-sink.json    |  17 +--
 .../main/docs/camel-lpr-kafka-sink-connector.adoc  |   5 +-
 .../lpr/CamelLprSinkConnectorConfig.java           |  12 +-
 .../src/generated/resources/camel-lucene-sink.json |  17 +--
 .../docs/camel-lucene-kafka-sink-connector.adoc    |   5 +-
 .../lucene/CamelLuceneSinkConnectorConfig.java     |  12 +-
 .../resources/camel-lumberjack-source.json         |  17 +--
 .../camel-lumberjack-kafka-source-connector.adoc   |   5 +-
 .../CamelLumberjackSourceConnectorConfig.java      |  12 +-
 .../generated/resources/camel-master-source.json   |  17 +--
 .../docs/camel-master-kafka-source-connector.adoc  |   5 +-
 .../master/CamelMasterSourceConnectorConfig.java   |  12 +-
 .../generated/resources/camel-metrics-sink.json    |  17 +--
 .../docs/camel-metrics-kafka-sink-connector.adoc   |   5 +-
 .../metrics/CamelMetricsSinkConnectorConfig.java   |  12 +-
 .../generated/resources/camel-micrometer-sink.json |  17 +--
 .../camel-micrometer-kafka-sink-connector.adoc     |   5 +-
 .../CamelMicrometerSinkConnectorConfig.java        |  12 +-
 .../resources/camel-microprofile-metrics-sink.json |  17 +--
 ...-microprofile-metrics-kafka-sink-connector.adoc |   5 +-
 ...amelMicroprofilemetricsSinkConnectorConfig.java |  12 +-
 .../resources/camel-milo-client-sink.json          |  17 +--
 .../resources/camel-milo-client-source.json        |  17 +--
 .../camel-milo-client-kafka-sink-connector.adoc    |   5 +-
 .../camel-milo-client-kafka-source-connector.adoc  |   5 +-
 .../CamelMiloclientSinkConnectorConfig.java        |  12 +-
 .../CamelMiloclientSourceConnectorConfig.java      |  12 +-
 .../resources/camel-milo-server-sink.json          |  17 +--
 .../resources/camel-milo-server-source.json        |  17 +--
 .../camel-milo-server-kafka-sink-connector.adoc    |   5 +-
 .../camel-milo-server-kafka-source-connector.adoc  |   5 +-
 .../CamelMiloserverSinkConnectorConfig.java        |  12 +-
 .../CamelMiloserverSourceConnectorConfig.java      |  12 +-
 .../src/generated/resources/camel-mina-sink.json   |  17 +--
 .../src/generated/resources/camel-mina-source.json |  17 +--
 .../main/docs/camel-mina-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-mina-kafka-source-connector.adoc    |   5 +-
 .../mina/CamelMinaSinkConnectorConfig.java         |  12 +-
 .../mina/CamelMinaSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-minio-sink.json  |  17 +--
 .../generated/resources/camel-minio-source.json    |  17 +--
 .../docs/camel-minio-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-minio-kafka-source-connector.adoc   |   5 +-
 .../minio/CamelMinioSinkConnectorConfig.java       |  12 +-
 .../minio/CamelMinioSourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-mllp-sink.json   |  17 +--
 .../src/generated/resources/camel-mllp-source.json |  17 +--
 .../main/docs/camel-mllp-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-mllp-kafka-source-connector.adoc    |   5 +-
 .../mllp/CamelMllpSinkConnectorConfig.java         |  12 +-
 .../mllp/CamelMllpSourceConnectorConfig.java       |  12 +-
 .../resources/camel-mongodb-gridfs-sink.json       |  17 +--
 .../resources/camel-mongodb-gridfs-source.json     |  17 +--
 .../camel-mongodb-gridfs-kafka-sink-connector.adoc |   5 +-
 ...amel-mongodb-gridfs-kafka-source-connector.adoc |   5 +-
 .../CamelMongodbgridfsSinkConnectorConfig.java     |  12 +-
 .../CamelMongodbgridfsSourceConnectorConfig.java   |  12 +-
 .../generated/resources/camel-mongodb-sink.json    |  17 +--
 .../generated/resources/camel-mongodb-source.json  |  17 +--
 .../docs/camel-mongodb-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-mongodb-kafka-source-connector.adoc |   5 +-
 .../mongodb/CamelMongodbSinkConnectorConfig.java   |  12 +-
 .../mongodb/CamelMongodbSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-msv-sink.json    |  17 +--
 .../main/docs/camel-msv-kafka-sink-connector.adoc  |   5 +-
 .../msv/CamelMsvSinkConnectorConfig.java           |  12 +-
 .../generated/resources/camel-mustache-sink.json   |  17 +--
 .../docs/camel-mustache-kafka-sink-connector.adoc  |   5 +-
 .../mustache/CamelMustacheSinkConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-mvel-sink.json   |  17 +--
 .../main/docs/camel-mvel-kafka-sink-connector.adoc |   5 +-
 .../mvel/CamelMvelSinkConnectorConfig.java         |  12 +-
 .../resources/camel-mybatis-bean-sink.json         |  17 +--
 .../camel-mybatis-bean-kafka-sink-connector.adoc   |   5 +-
 .../CamelMybatisbeanSinkConnectorConfig.java       |  12 +-
 .../generated/resources/camel-mybatis-sink.json    |  17 +--
 .../generated/resources/camel-mybatis-source.json  |  17 +--
 .../docs/camel-mybatis-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-mybatis-kafka-source-connector.adoc |   5 +-
 .../mybatis/CamelMybatisSinkConnectorConfig.java   |  12 +-
 .../mybatis/CamelMybatisSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-nagios-sink.json |  17 +--
 .../docs/camel-nagios-kafka-sink-connector.adoc    |   5 +-
 .../nagios/CamelNagiosSinkConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-nats-sink.json   |  24 ++--
 .../src/generated/resources/camel-nats-source.json |  24 ++--
 .../main/docs/camel-nats-kafka-sink-connector.adoc |   4 +-
 .../docs/camel-nats-kafka-source-connector.adoc    |   4 +-
 .../nats/CamelNatsSinkConnectorConfig.java         |  16 +--
 .../nats/CamelNatsSourceConnectorConfig.java       |  16 +--
 .../generated/resources/camel-netty-http-sink.json |  17 +--
 .../resources/camel-netty-http-source.json         |  17 +--
 .../camel-netty-http-kafka-sink-connector.adoc     |   5 +-
 .../camel-netty-http-kafka-source-connector.adoc   |   5 +-
 .../CamelNettyhttpSinkConnectorConfig.java         |  12 +-
 .../CamelNettyhttpSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-netty-sink.json  |  17 +--
 .../generated/resources/camel-netty-source.json    |  17 +--
 .../docs/camel-netty-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-netty-kafka-source-connector.adoc   |   5 +-
 .../netty/CamelNettySinkConnectorConfig.java       |  12 +-
 .../netty/CamelNettySourceConnectorConfig.java     |  12 +-
 .../generated/resources/camel-nitrite-sink.json    |  17 +--
 .../generated/resources/camel-nitrite-source.json  |  17 +--
 .../docs/camel-nitrite-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-nitrite-kafka-source-connector.adoc |   5 +-
 .../nitrite/CamelNitriteSinkConnectorConfig.java   |  12 +-
 .../nitrite/CamelNitriteSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-nsq-sink.json    |  17 +--
 .../src/generated/resources/camel-nsq-source.json  |  17 +--
 .../main/docs/camel-nsq-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-nsq-kafka-source-connector.adoc     |   5 +-
 .../nsq/CamelNsqSinkConnectorConfig.java           |  12 +-
 .../nsq/CamelNsqSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-oaipmh-sink.json |  17 +--
 .../generated/resources/camel-oaipmh-source.json   |  17 +--
 .../docs/camel-oaipmh-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-oaipmh-kafka-source-connector.adoc  |   5 +-
 .../oaipmh/CamelOaipmhSinkConnectorConfig.java     |  12 +-
 .../oaipmh/CamelOaipmhSourceConnectorConfig.java   |  12 +-
 .../generated/resources/camel-olingo2-sink.json    |  17 +--
 .../generated/resources/camel-olingo2-source.json  |  17 +--
 .../docs/camel-olingo2-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-olingo2-kafka-source-connector.adoc |   5 +-
 .../olingo2/CamelOlingo2SinkConnectorConfig.java   |  12 +-
 .../olingo2/CamelOlingo2SourceConnectorConfig.java |  12 +-
 .../generated/resources/camel-olingo4-sink.json    |  17 +--
 .../generated/resources/camel-olingo4-source.json  |  17 +--
 .../docs/camel-olingo4-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-olingo4-kafka-source-connector.adoc |   5 +-
 .../olingo4/CamelOlingo4SinkConnectorConfig.java   |  12 +-
 .../olingo4/CamelOlingo4SourceConnectorConfig.java |  12 +-
 .../camel-openshift-build-configs-sink.json        |  17 +--
 ...enshift-build-configs-kafka-sink-connector.adoc |   5 +-
 ...elOpenshiftbuildconfigsSinkConnectorConfig.java |  12 +-
 .../resources/camel-openshift-builds-sink.json     |  17 +--
 ...amel-openshift-builds-kafka-sink-connector.adoc |   5 +-
 .../CamelOpenshiftbuildsSinkConnectorConfig.java   |  12 +-
 .../resources/camel-openstack-cinder-sink.json     |  17 +--
 ...amel-openstack-cinder-kafka-sink-connector.adoc |   5 +-
 .../CamelOpenstackcinderSinkConnectorConfig.java   |  12 +-
 .../resources/camel-openstack-glance-sink.json     |  17 +--
 ...amel-openstack-glance-kafka-sink-connector.adoc |   5 +-
 .../CamelOpenstackglanceSinkConnectorConfig.java   |  12 +-
 .../resources/camel-openstack-keystone-sink.json   |  17 +--
 ...el-openstack-keystone-kafka-sink-connector.adoc |   5 +-
 .../CamelOpenstackkeystoneSinkConnectorConfig.java |  12 +-
 .../resources/camel-openstack-neutron-sink.json    |  17 +--
 ...mel-openstack-neutron-kafka-sink-connector.adoc |   5 +-
 .../CamelOpenstackneutronSinkConnectorConfig.java  |  12 +-
 .../resources/camel-openstack-nova-sink.json       |  17 +--
 .../camel-openstack-nova-kafka-sink-connector.adoc |   5 +-
 .../CamelOpenstacknovaSinkConnectorConfig.java     |  12 +-
 .../resources/camel-openstack-swift-sink.json      |  17 +--
 ...camel-openstack-swift-kafka-sink-connector.adoc |   5 +-
 .../CamelOpenstackswiftSinkConnectorConfig.java    |  12 +-
 .../resources/camel-optaplanner-sink.json          |  17 +--
 .../resources/camel-optaplanner-source.json        |  17 +--
 .../camel-optaplanner-kafka-sink-connector.adoc    |   5 +-
 .../camel-optaplanner-kafka-source-connector.adoc  |   5 +-
 .../CamelOptaplannerSinkConnectorConfig.java       |  12 +-
 .../CamelOptaplannerSourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-paho-sink.json   |  17 +--
 .../src/generated/resources/camel-paho-source.json |  17 +--
 .../main/docs/camel-paho-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-paho-kafka-source-connector.adoc    |   5 +-
 .../paho/CamelPahoSinkConnectorConfig.java         |  12 +-
 .../paho/CamelPahoSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-pdf-sink.json    |  17 +--
 .../main/docs/camel-pdf-kafka-sink-connector.adoc  |   5 +-
 .../pdf/CamelPdfSinkConnectorConfig.java           |  12 +-
 .../camel-pg-replication-slot-source.json          |  17 +--
 ...pg-replication-slot-kafka-source-connector.adoc |   5 +-
 ...amelPgreplicationslotSourceConnectorConfig.java |  12 +-
 .../generated/resources/camel-pgevent-sink.json    |  17 +--
 .../generated/resources/camel-pgevent-source.json  |  17 +--
 .../docs/camel-pgevent-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-pgevent-kafka-source-connector.adoc |   5 +-
 .../pgevent/CamelPgeventSinkConnectorConfig.java   |  12 +-
 .../pgevent/CamelPgeventSourceConnectorConfig.java |  12 +-
 .../resources/camel-platform-http-source.json      |  17 +--
 ...camel-platform-http-kafka-source-connector.adoc |   5 +-
 .../CamelPlatformhttpSourceConnectorConfig.java    |  12 +-
 .../src/generated/resources/camel-pop3-sink.json   |  17 +--
 .../src/generated/resources/camel-pop3-source.json |  17 +--
 .../main/docs/camel-pop3-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-pop3-kafka-source-connector.adoc    |   5 +-
 .../pop3/CamelPop3SinkConnectorConfig.java         |  12 +-
 .../pop3/CamelPop3SourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-pop3s-sink.json  |  17 +--
 .../generated/resources/camel-pop3s-source.json    |  17 +--
 .../docs/camel-pop3s-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-pop3s-kafka-source-connector.adoc   |   5 +-
 .../pop3s/CamelPop3sSinkConnectorConfig.java       |  12 +-
 .../pop3s/CamelPop3sSourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-pubnub-sink.json |  17 +--
 .../generated/resources/camel-pubnub-source.json   |  17 +--
 .../docs/camel-pubnub-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-pubnub-kafka-source-connector.adoc  |   5 +-
 .../pubnub/CamelPubnubSinkConnectorConfig.java     |  12 +-
 .../pubnub/CamelPubnubSourceConnectorConfig.java   |  12 +-
 .../src/generated/resources/camel-pulsar-sink.json |  17 +--
 .../generated/resources/camel-pulsar-source.json   |  17 +--
 .../docs/camel-pulsar-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-pulsar-kafka-source-connector.adoc  |   5 +-
 .../pulsar/CamelPulsarSinkConnectorConfig.java     |  12 +-
 .../pulsar/CamelPulsarSourceConnectorConfig.java   |  12 +-
 .../generated/resources/camel-quartz-source.json   |  17 +--
 .../docs/camel-quartz-kafka-source-connector.adoc  |   5 +-
 .../quartz/CamelQuartzSourceConnectorConfig.java   |  12 +-
 .../generated/resources/camel-quickfix-sink.json   |  17 +--
 .../generated/resources/camel-quickfix-source.json |  17 +--
 .../docs/camel-quickfix-kafka-sink-connector.adoc  |   5 +-
 .../camel-quickfix-kafka-source-connector.adoc     |   5 +-
 .../quickfix/CamelQuickfixSinkConnectorConfig.java |  12 +-
 .../CamelQuickfixSourceConnectorConfig.java        |  12 +-
 .../generated/resources/camel-rabbitmq-sink.json   |  17 +--
 .../generated/resources/camel-rabbitmq-source.json |  17 +--
 .../docs/camel-rabbitmq-kafka-sink-connector.adoc  |   5 +-
 .../camel-rabbitmq-kafka-source-connector.adoc     |   5 +-
 .../rabbitmq/CamelRabbitmqSinkConnectorConfig.java |  12 +-
 .../CamelRabbitmqSourceConnectorConfig.java        |  12 +-
 .../resources/camel-reactive-streams-sink.json     |  17 +--
 .../resources/camel-reactive-streams-source.json   |  17 +--
 ...amel-reactive-streams-kafka-sink-connector.adoc |   5 +-
 ...el-reactive-streams-kafka-source-connector.adoc |   5 +-
 .../CamelReactivestreamsSinkConnectorConfig.java   |  12 +-
 .../CamelReactivestreamsSourceConnectorConfig.java |  12 +-
 .../generated/resources/camel-rest-api-source.json |  17 +--
 .../camel-rest-api-kafka-source-connector.adoc     |   5 +-
 .../restapi/CamelRestapiSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-rest-sink.json   |  17 +--
 .../src/generated/resources/camel-rest-source.json |  17 +--
 .../main/docs/camel-rest-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-rest-kafka-source-connector.adoc    |   5 +-
 .../rest/CamelRestSinkConnectorConfig.java         |  12 +-
 .../rest/CamelRestSourceConnectorConfig.java       |  12 +-
 .../resources/camel-rest-openapi-sink.json         |  17 +--
 .../camel-rest-openapi-kafka-sink-connector.adoc   |   5 +-
 .../CamelRestopenapiSinkConnectorConfig.java       |  12 +-
 .../resources/camel-rest-swagger-sink.json         |  17 +--
 .../camel-rest-swagger-kafka-sink-connector.adoc   |   5 +-
 .../CamelRestswaggerSinkConnectorConfig.java       |  12 +-
 .../generated/resources/camel-resteasy-sink.json   |  17 +--
 .../generated/resources/camel-resteasy-source.json |  17 +--
 .../docs/camel-resteasy-kafka-sink-connector.adoc  |   5 +-
 .../camel-resteasy-kafka-source-connector.adoc     |   5 +-
 .../resteasy/CamelResteasySinkConnectorConfig.java |  12 +-
 .../CamelResteasySourceConnectorConfig.java        |  12 +-
 .../src/generated/resources/camel-rss-source.json  |  17 +--
 .../docs/camel-rss-kafka-source-connector.adoc     |   5 +-
 .../rss/CamelRssSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-saga-sink.json   |  17 +--
 .../main/docs/camel-saga-kafka-sink-connector.adoc |   5 +-
 .../saga/CamelSagaSinkConnectorConfig.java         |  12 +-
 .../generated/resources/camel-salesforce-sink.json |  17 +--
 .../resources/camel-salesforce-source.json         |  17 +--
 .../camel-salesforce-kafka-sink-connector.adoc     |   5 +-
 .../camel-salesforce-kafka-source-connector.adoc   |   5 +-
 .../CamelSalesforceSinkConnectorConfig.java        |  12 +-
 .../CamelSalesforceSourceConnectorConfig.java      |  12 +-
 .../resources/camel-sap-netweaver-sink.json        |  17 +--
 .../camel-sap-netweaver-kafka-sink-connector.adoc  |   5 +-
 .../CamelSapnetweaverSinkConnectorConfig.java      |  12 +-
 .../resources/camel-scheduler-source.json          |  17 +--
 .../camel-scheduler-kafka-source-connector.adoc    |   5 +-
 .../CamelSchedulerSourceConnectorConfig.java       |  12 +-
 .../generated/resources/camel-schematron-sink.json |  17 +--
 .../camel-schematron-kafka-sink-connector.adoc     |   5 +-
 .../CamelSchematronSinkConnectorConfig.java        |  12 +-
 .../src/generated/resources/camel-scp-sink.json    |  17 +--
 .../main/docs/camel-scp-kafka-sink-connector.adoc  |   5 +-
 .../scp/CamelScpSinkConnectorConfig.java           |  12 +-
 .../src/generated/resources/camel-seda-sink.json   |  17 +--
 .../src/generated/resources/camel-seda-source.json |  17 +--
 .../main/docs/camel-seda-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-seda-kafka-source-connector.adoc    |   5 +-
 .../seda/CamelSedaSinkConnectorConfig.java         |  12 +-
 .../seda/CamelSedaSourceConnectorConfig.java       |  12 +-
 .../generated/resources/camel-service-source.json  |  17 +--
 .../docs/camel-service-kafka-source-connector.adoc |   5 +-
 .../service/CamelServiceSourceConnectorConfig.java |  12 +-
 .../generated/resources/camel-servicenow-sink.json |  17 +--
 .../camel-servicenow-kafka-sink-connector.adoc     |   5 +-
 .../CamelServicenowSinkConnectorConfig.java        |  12 +-
 .../generated/resources/camel-servlet-source.json  |  17 +--
 .../docs/camel-servlet-kafka-source-connector.adoc |   5 +-
 .../servlet/CamelServletSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-sftp-sink.json   |  17 +--
 .../src/generated/resources/camel-sftp-source.json |  17 +--
 .../main/docs/camel-sftp-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-sftp-kafka-source-connector.adoc    |   5 +-
 .../sftp/CamelSftpSinkConnectorConfig.java         |  12 +-
 .../sftp/CamelSftpSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-sip-sink.json    |  17 +--
 .../src/generated/resources/camel-sip-source.json  |  17 +--
 .../main/docs/camel-sip-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-sip-kafka-source-connector.adoc     |   5 +-
 .../sip/CamelSipSinkConnectorConfig.java           |  12 +-
 .../sip/CamelSipSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-sips-sink.json   |  17 +--
 .../src/generated/resources/camel-sips-source.json |  17 +--
 .../main/docs/camel-sips-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-sips-kafka-source-connector.adoc    |   5 +-
 .../sips/CamelSipsSinkConnectorConfig.java         |  12 +-
 .../sips/CamelSipsSourceConnectorConfig.java       |  12 +-
 .../resources/camel-sjms-batch-source.json         |  17 +--
 .../camel-sjms-batch-kafka-source-connector.adoc   |   5 +-
 .../CamelSjmsbatchSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-sjms-sink.json   |  29 ++---
 .../src/generated/resources/camel-sjms-source.json |  29 ++---
 .../main/docs/camel-sjms-kafka-sink-connector.adoc |   7 +-
 .../docs/camel-sjms-kafka-source-connector.adoc    |   7 +-
 .../sjms/CamelSjmsSinkConnectorConfig.java         |  20 ++--
 .../sjms/CamelSjmsSourceConnectorConfig.java       |  20 ++--
 .../src/generated/resources/camel-sjms2-sink.json  |  29 ++---
 .../generated/resources/camel-sjms2-source.json    |  29 ++---
 .../docs/camel-sjms2-kafka-sink-connector.adoc     |   7 +-
 .../docs/camel-sjms2-kafka-source-connector.adoc   |   7 +-
 .../sjms2/CamelSjms2SinkConnectorConfig.java       |  20 ++--
 .../sjms2/CamelSjms2SourceConnectorConfig.java     |  20 ++--
 .../src/generated/resources/camel-slack-sink.json  |  17 +--
 .../generated/resources/camel-slack-source.json    |  17 +--
 .../docs/camel-slack-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-slack-kafka-source-connector.adoc   |   5 +-
 .../slack/CamelSlackSinkConnectorConfig.java       |  12 +-
 .../slack/CamelSlackSourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-smpp-sink.json   |  17 +--
 .../src/generated/resources/camel-smpp-source.json |  17 +--
 .../main/docs/camel-smpp-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-smpp-kafka-source-connector.adoc    |   5 +-
 .../smpp/CamelSmppSinkConnectorConfig.java         |  12 +-
 .../smpp/CamelSmppSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-smpps-sink.json  |  17 +--
 .../generated/resources/camel-smpps-source.json    |  17 +--
 .../docs/camel-smpps-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-smpps-kafka-source-connector.adoc   |   5 +-
 .../smpps/CamelSmppsSinkConnectorConfig.java       |  12 +-
 .../smpps/CamelSmppsSourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-smtp-sink.json   |  17 +--
 .../src/generated/resources/camel-smtp-source.json |  17 +--
 .../main/docs/camel-smtp-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-smtp-kafka-source-connector.adoc    |   5 +-
 .../smtp/CamelSmtpSinkConnectorConfig.java         |  12 +-
 .../smtp/CamelSmtpSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-smtps-sink.json  |  17 +--
 .../generated/resources/camel-smtps-source.json    |  17 +--
 .../docs/camel-smtps-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-smtps-kafka-source-connector.adoc   |   5 +-
 .../smtps/CamelSmtpsSinkConnectorConfig.java       |  12 +-
 .../smtps/CamelSmtpsSourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-snmp-sink.json   |  17 +--
 .../src/generated/resources/camel-snmp-source.json |  17 +--
 .../main/docs/camel-snmp-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-snmp-kafka-source-connector.adoc    |   5 +-
 .../snmp/CamelSnmpSinkConnectorConfig.java         |  12 +-
 .../snmp/CamelSnmpSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-solr-sink.json   |  17 +--
 .../main/docs/camel-solr-kafka-sink-connector.adoc |   5 +-
 .../solr/CamelSolrSinkConnectorConfig.java         |  12 +-
 .../generated/resources/camel-solrCloud-sink.json  |  17 +--
 .../docs/camel-solrCloud-kafka-sink-connector.adoc |   5 +-
 .../CamelSolrcloudSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-solrs-sink.json  |  17 +--
 .../docs/camel-solrs-kafka-sink-connector.adoc     |   5 +-
 .../solrs/CamelSolrsSinkConnectorConfig.java       |  12 +-
 .../generated/resources/camel-soroush-sink.json    |  17 +--
 .../generated/resources/camel-soroush-source.json  |  17 +--
 .../docs/camel-soroush-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-soroush-kafka-source-connector.adoc |   5 +-
 .../soroush/CamelSoroushSinkConnectorConfig.java   |  12 +-
 .../soroush/CamelSoroushSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-spark-sink.json  |  17 +--
 .../docs/camel-spark-kafka-sink-connector.adoc     |   5 +-
 .../spark/CamelSparkSinkConnectorConfig.java       |  12 +-
 .../generated/resources/camel-splunk-hec-sink.json |  17 +--
 .../camel-splunk-hec-kafka-sink-connector.adoc     |   5 +-
 .../CamelSplunkhecSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-splunk-sink.json |  17 +--
 .../generated/resources/camel-splunk-source.json   |  17 +--
 .../docs/camel-splunk-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-splunk-kafka-source-connector.adoc  |   5 +-
 .../splunk/CamelSplunkSinkConnectorConfig.java     |  12 +-
 .../splunk/CamelSplunkSourceConnectorConfig.java   |  12 +-
 .../resources/camel-spring-batch-sink.json         |  17 +--
 .../camel-spring-batch-kafka-sink-connector.adoc   |   5 +-
 .../CamelSpringbatchSinkConnectorConfig.java       |  12 +-
 .../resources/camel-spring-event-sink.json         |  17 +--
 .../resources/camel-spring-event-source.json       |  17 +--
 .../camel-spring-event-kafka-sink-connector.adoc   |   5 +-
 .../camel-spring-event-kafka-source-connector.adoc |   5 +-
 .../CamelSpringeventSinkConnectorConfig.java       |  12 +-
 .../CamelSpringeventSourceConnectorConfig.java     |  12 +-
 .../resources/camel-spring-integration-sink.json   |  17 +--
 .../resources/camel-spring-integration-source.json |  17 +--
 ...el-spring-integration-kafka-sink-connector.adoc |   5 +-
 ...-spring-integration-kafka-source-connector.adoc |   5 +-
 .../CamelSpringintegrationSinkConnectorConfig.java |  12 +-
 ...amelSpringintegrationSourceConnectorConfig.java |  12 +-
 .../resources/camel-spring-ldap-sink.json          |  17 +--
 .../camel-spring-ldap-kafka-sink-connector.adoc    |   5 +-
 .../CamelSpringldapSinkConnectorConfig.java        |  12 +-
 .../resources/camel-spring-redis-sink.json         |  17 +--
 .../resources/camel-spring-redis-source.json       |  17 +--
 .../camel-spring-redis-kafka-sink-connector.adoc   |   5 +-
 .../camel-spring-redis-kafka-source-connector.adoc |   5 +-
 .../CamelSpringredisSinkConnectorConfig.java       |  12 +-
 .../CamelSpringredisSourceConnectorConfig.java     |  12 +-
 .../generated/resources/camel-spring-ws-sink.json  |  17 +--
 .../resources/camel-spring-ws-source.json          |  17 +--
 .../docs/camel-spring-ws-kafka-sink-connector.adoc |   5 +-
 .../camel-spring-ws-kafka-source-connector.adoc    |   5 +-
 .../springws/CamelSpringwsSinkConnectorConfig.java |  12 +-
 .../CamelSpringwsSourceConnectorConfig.java        |  12 +-
 .../src/generated/resources/camel-sql-sink.json    |  17 +--
 .../src/generated/resources/camel-sql-source.json  |  17 +--
 .../main/docs/camel-sql-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-sql-kafka-source-connector.adoc     |   5 +-
 .../sql/CamelSqlSinkConnectorConfig.java           |  12 +-
 .../sql/CamelSqlSourceConnectorConfig.java         |  12 +-
 .../generated/resources/camel-sql-stored-sink.json |  17 +--
 .../camel-sql-stored-kafka-sink-connector.adoc     |   5 +-
 .../CamelSqlstoredSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-ssh-sink.json    |  17 +--
 .../src/generated/resources/camel-ssh-source.json  |  17 +--
 .../main/docs/camel-ssh-kafka-sink-connector.adoc  |   5 +-
 .../docs/camel-ssh-kafka-source-connector.adoc     |   5 +-
 .../ssh/CamelSshSinkConnectorConfig.java           |  12 +-
 .../ssh/CamelSshSourceConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-stax-sink.json   |  17 +--
 .../main/docs/camel-stax-kafka-sink-connector.adoc |   5 +-
 .../stax/CamelStaxSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-stomp-sink.json  |  17 +--
 .../generated/resources/camel-stomp-source.json    |  17 +--
 .../docs/camel-stomp-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-stomp-kafka-source-connector.adoc   |   5 +-
 .../stomp/CamelStompSinkConnectorConfig.java       |  12 +-
 .../stomp/CamelStompSourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-stream-sink.json |  17 +--
 .../generated/resources/camel-stream-source.json   |  17 +--
 .../docs/camel-stream-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-stream-kafka-source-connector.adoc  |   5 +-
 .../stream/CamelStreamSinkConnectorConfig.java     |  12 +-
 .../stream/CamelStreamSourceConnectorConfig.java   |  12 +-
 .../resources/camel-string-template-sink.json      |  17 +--
 ...camel-string-template-kafka-sink-connector.adoc |   5 +-
 .../CamelStringtemplateSinkConnectorConfig.java    |  12 +-
 .../src/generated/resources/camel-stub-sink.json   |  17 +--
 .../src/generated/resources/camel-stub-source.json |  17 +--
 .../main/docs/camel-stub-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-stub-kafka-source-connector.adoc    |   5 +-
 .../stub/CamelStubSinkConnectorConfig.java         |  12 +-
 .../stub/CamelStubSourceConnectorConfig.java       |  12 +-
 .../generated/resources/camel-telegram-sink.json   |  21 ++--
 .../generated/resources/camel-telegram-source.json |  21 ++--
 .../docs/camel-telegram-kafka-sink-connector.adoc  |   5 +-
 .../camel-telegram-kafka-source-connector.adoc     |   5 +-
 .../telegram/CamelTelegramSinkConnectorConfig.java |  12 +-
 .../CamelTelegramSourceConnectorConfig.java        |  12 +-
 .../src/generated/resources/camel-thrift-sink.json |  17 +--
 .../generated/resources/camel-thrift-source.json   |  17 +--
 .../docs/camel-thrift-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-thrift-kafka-source-connector.adoc  |   5 +-
 .../thrift/CamelThriftSinkConnectorConfig.java     |  12 +-
 .../thrift/CamelThriftSourceConnectorConfig.java   |  12 +-
 .../src/generated/resources/camel-tika-sink.json   |  17 +--
 .../main/docs/camel-tika-kafka-sink-connector.adoc |   5 +-
 .../tika/CamelTikaSinkConnectorConfig.java         |  12 +-
 .../generated/resources/camel-timer-source.json    |  17 +--
 .../docs/camel-timer-kafka-source-connector.adoc   |   5 +-
 .../timer/CamelTimerSourceConnectorConfig.java     |  12 +-
 .../src/generated/resources/camel-twilio-sink.json |  17 +--
 .../generated/resources/camel-twilio-source.json   |  17 +--
 .../docs/camel-twilio-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-twilio-kafka-source-connector.adoc  |   5 +-
 .../twilio/CamelTwilioSinkConnectorConfig.java     |  12 +-
 .../twilio/CamelTwilioSourceConnectorConfig.java   |  12 +-
 .../camel-twitter-directmessage-sink.json          |  17 +--
 .../camel-twitter-directmessage-source.json        |  17 +--
 ...twitter-directmessage-kafka-sink-connector.adoc |   5 +-
 ...itter-directmessage-kafka-source-connector.adoc |   5 +-
 ...melTwitterdirectmessageSinkConnectorConfig.java |  12 +-
 ...lTwitterdirectmessageSourceConnectorConfig.java |  12 +-
 .../resources/camel-twitter-search-sink.json       |  17 +--
 .../resources/camel-twitter-search-source.json     |  17 +--
 .../camel-twitter-search-kafka-sink-connector.adoc |   5 +-
 ...amel-twitter-search-kafka-source-connector.adoc |   5 +-
 .../CamelTwittersearchSinkConnectorConfig.java     |  12 +-
 .../CamelTwittersearchSourceConnectorConfig.java   |  12 +-
 .../resources/camel-twitter-timeline-sink.json     |  17 +--
 .../resources/camel-twitter-timeline-source.json   |  17 +--
 ...amel-twitter-timeline-kafka-sink-connector.adoc |   5 +-
 ...el-twitter-timeline-kafka-source-connector.adoc |   5 +-
 .../CamelTwittertimelineSinkConnectorConfig.java   |  12 +-
 .../CamelTwittertimelineSourceConnectorConfig.java |  12 +-
 .../generated/resources/camel-undertow-sink.json   |  17 +--
 .../generated/resources/camel-undertow-source.json |  17 +--
 .../docs/camel-undertow-kafka-sink-connector.adoc  |   5 +-
 .../camel-undertow-kafka-source-connector.adoc     |   5 +-
 .../undertow/CamelUndertowSinkConnectorConfig.java |  12 +-
 .../CamelUndertowSourceConnectorConfig.java        |  12 +-
 .../generated/resources/camel-validator-sink.json  |  17 +--
 .../docs/camel-validator-kafka-sink-connector.adoc |   5 +-
 .../CamelValidatorSinkConnectorConfig.java         |  12 +-
 .../generated/resources/camel-velocity-sink.json   |  17 +--
 .../docs/camel-velocity-kafka-sink-connector.adoc  |   5 +-
 .../velocity/CamelVelocitySinkConnectorConfig.java |  12 +-
 .../generated/resources/camel-vertx-http-sink.json |  17 +--
 .../camel-vertx-http-kafka-sink-connector.adoc     |   5 +-
 .../CamelVertxhttpSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-vertx-sink.json  |  17 +--
 .../generated/resources/camel-vertx-source.json    |  17 +--
 .../docs/camel-vertx-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-vertx-kafka-source-connector.adoc   |   5 +-
 .../vertx/CamelVertxSinkConnectorConfig.java       |  12 +-
 .../vertx/CamelVertxSourceConnectorConfig.java     |  12 +-
 .../resources/camel-vertx-websocket-sink.json      |  17 +--
 .../resources/camel-vertx-websocket-source.json    |  17 +--
 ...camel-vertx-websocket-kafka-sink-connector.adoc |   5 +-
 ...mel-vertx-websocket-kafka-source-connector.adoc |   5 +-
 .../CamelVertxwebsocketSinkConnectorConfig.java    |  12 +-
 .../CamelVertxwebsocketSourceConnectorConfig.java  |  12 +-
 .../src/generated/resources/camel-vm-sink.json     |  17 +--
 .../src/generated/resources/camel-vm-source.json   |  17 +--
 .../main/docs/camel-vm-kafka-sink-connector.adoc   |   5 +-
 .../main/docs/camel-vm-kafka-source-connector.adoc |   5 +-
 .../vm/CamelVmSinkConnectorConfig.java             |  12 +-
 .../vm/CamelVmSourceConnectorConfig.java           |  12 +-
 .../generated/resources/camel-weather-sink.json    |  17 +--
 .../generated/resources/camel-weather-source.json  |  17 +--
 .../docs/camel-weather-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-weather-kafka-source-connector.adoc |   5 +-
 .../weather/CamelWeatherSinkConnectorConfig.java   |  12 +-
 .../weather/CamelWeatherSourceConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-web3j-sink.json  |  17 +--
 .../generated/resources/camel-web3j-source.json    |  17 +--
 .../docs/camel-web3j-kafka-sink-connector.adoc     |   5 +-
 .../docs/camel-web3j-kafka-source-connector.adoc   |   5 +-
 .../web3j/CamelWeb3jSinkConnectorConfig.java       |  12 +-
 .../web3j/CamelWeb3jSourceConnectorConfig.java     |  12 +-
 .../generated/resources/camel-webhook-source.json  |  17 +--
 .../docs/camel-webhook-kafka-source-connector.adoc |   5 +-
 .../webhook/CamelWebhookSourceConnectorConfig.java |  12 +-
 .../resources/camel-websocket-jsr356-sink.json     |  17 +--
 .../resources/camel-websocket-jsr356-source.json   |  17 +--
 ...amel-websocket-jsr356-kafka-sink-connector.adoc |   5 +-
 ...el-websocket-jsr356-kafka-source-connector.adoc |   5 +-
 .../CamelWebsocketjsr356SinkConnectorConfig.java   |  12 +-
 .../CamelWebsocketjsr356SourceConnectorConfig.java |  12 +-
 .../generated/resources/camel-websocket-sink.json  |  17 +--
 .../resources/camel-websocket-source.json          |  17 +--
 .../docs/camel-websocket-kafka-sink-connector.adoc |   5 +-
 .../camel-websocket-kafka-source-connector.adoc    |   5 +-
 .../CamelWebsocketSinkConnectorConfig.java         |  12 +-
 .../CamelWebsocketSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-weka-sink.json   |  17 +--
 .../main/docs/camel-weka-kafka-sink-connector.adoc |   5 +-
 .../weka/CamelWekaSinkConnectorConfig.java         |  12 +-
 .../generated/resources/camel-wordpress-sink.json  |  17 +--
 .../resources/camel-wordpress-source.json          |  17 +--
 .../docs/camel-wordpress-kafka-sink-connector.adoc |   5 +-
 .../camel-wordpress-kafka-source-connector.adoc    |   5 +-
 .../CamelWordpressSinkConnectorConfig.java         |  12 +-
 .../CamelWordpressSourceConnectorConfig.java       |  12 +-
 .../generated/resources/camel-workday-sink.json    |  17 +--
 .../docs/camel-workday-kafka-sink-connector.adoc   |   5 +-
 .../workday/CamelWorkdaySinkConnectorConfig.java   |  12 +-
 .../generated/resources/camel-xchange-sink.json    |  17 +--
 .../docs/camel-xchange-kafka-sink-connector.adoc   |   5 +-
 .../xchange/CamelXchangeSinkConnectorConfig.java   |  12 +-
 .../src/generated/resources/camel-xj-sink.json     |  17 +--
 .../main/docs/camel-xj-kafka-sink-connector.adoc   |   5 +-
 .../xj/CamelXjSinkConnectorConfig.java             |  12 +-
 .../resources/camel-xmlsecurity-sign-sink.json     |  17 +--
 ...amel-xmlsecurity-sign-kafka-sink-connector.adoc |   5 +-
 .../CamelXmlsecuritysignSinkConnectorConfig.java   |  12 +-
 .../resources/camel-xmlsecurity-verify-sink.json   |  17 +--
 ...el-xmlsecurity-verify-kafka-sink-connector.adoc |   5 +-
 .../CamelXmlsecurityverifySinkConnectorConfig.java |  12 +-
 .../src/generated/resources/camel-xmpp-sink.json   |  17 +--
 .../src/generated/resources/camel-xmpp-source.json |  17 +--
 .../main/docs/camel-xmpp-kafka-sink-connector.adoc |   5 +-
 .../docs/camel-xmpp-kafka-source-connector.adoc    |   5 +-
 .../xmpp/CamelXmppSinkConnectorConfig.java         |  12 +-
 .../xmpp/CamelXmppSourceConnectorConfig.java       |  12 +-
 .../src/generated/resources/camel-xquery-sink.json |  17 +--
 .../generated/resources/camel-xquery-source.json   |  17 +--
 .../docs/camel-xquery-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-xquery-kafka-source-connector.adoc  |   5 +-
 .../xquery/CamelXquerySinkConnectorConfig.java     |  12 +-
 .../xquery/CamelXquerySourceConnectorConfig.java   |  12 +-
 .../src/generated/resources/camel-xslt-sink.json   |  17 +--
 .../main/docs/camel-xslt-kafka-sink-connector.adoc |   5 +-
 .../xslt/CamelXsltSinkConnectorConfig.java         |  12 +-
 .../generated/resources/camel-xslt-saxon-sink.json |  17 +--
 .../camel-xslt-saxon-kafka-sink-connector.adoc     |   5 +-
 .../CamelXsltsaxonSinkConnectorConfig.java         |  12 +-
 .../src/generated/resources/camel-yammer-sink.json |  17 +--
 .../generated/resources/camel-yammer-source.json   |  17 +--
 .../docs/camel-yammer-kafka-sink-connector.adoc    |   5 +-
 .../docs/camel-yammer-kafka-source-connector.adoc  |   5 +-
 .../yammer/CamelYammerSinkConnectorConfig.java     |  12 +-
 .../yammer/CamelYammerSourceConnectorConfig.java   |  12 +-
 .../generated/resources/camel-zendesk-sink.json    |  17 +--
 .../generated/resources/camel-zendesk-source.json  |  17 +--
 .../docs/camel-zendesk-kafka-sink-connector.adoc   |   5 +-
 .../docs/camel-zendesk-kafka-source-connector.adoc |   5 +-
 .../zendesk/CamelZendeskSinkConnectorConfig.java   |  12 +-
 .../zendesk/CamelZendeskSourceConnectorConfig.java |  12 +-
 .../generated/resources/camel-zookeeper-sink.json  |  17 +--
 .../resources/camel-zookeeper-source.json          |  17 +--
 .../docs/camel-zookeeper-kafka-sink-connector.adoc |   5 +-
 .../camel-zookeeper-kafka-source-connector.adoc    |   5 +-
 .../CamelZookeeperSinkConnectorConfig.java         |  12 +-
 .../CamelZookeeperSourceConnectorConfig.java       |  12 +-
 .../resources/camel-zookeeper-master-source.json   |  17 +--
 ...el-zookeeper-master-kafka-source-connector.adoc |   5 +-
 .../CamelZookeepermasterSourceConnectorConfig.java |  12 +-
 .../camel-activemq-kafka-sink-connector.adoc       |   5 +-
 .../camel-activemq-kafka-source-connector.adoc     |   5 +-
 .../connectors/camel-ahc-kafka-sink-connector.adoc |   5 +-
 .../camel-ahc-ws-kafka-sink-connector.adoc         |   5 +-
 .../camel-ahc-ws-kafka-source-connector.adoc       |   5 +-
 .../camel-ahc-wss-kafka-sink-connector.adoc        |   5 +-
 .../camel-ahc-wss-kafka-source-connector.adoc      |   5 +-
 .../camel-amqp-kafka-sink-connector.adoc           |   5 +-
 .../camel-amqp-kafka-source-connector.adoc         |   5 +-
 .../camel-apns-kafka-sink-connector.adoc           |   5 +-
 .../camel-apns-kafka-source-connector.adoc         |   5 +-
 .../camel-arangodb-kafka-sink-connector.adoc       |   5 +-
 .../connectors/camel-as2-kafka-sink-connector.adoc |   5 +-
 .../camel-as2-kafka-source-connector.adoc          |   5 +-
 .../camel-asterisk-kafka-sink-connector.adoc       |   5 +-
 .../camel-asterisk-kafka-source-connector.adoc     |   5 +-
 .../camel-atlasmap-kafka-sink-connector.adoc       |   9 +-
 .../camel-atmos-kafka-sink-connector.adoc          |   5 +-
 .../camel-atmos-kafka-source-connector.adoc        |   5 +-
 ...-atmosphere-websocket-kafka-sink-connector.adoc |   5 +-
 ...tmosphere-websocket-kafka-source-connector.adoc |   5 +-
 .../camel-atom-kafka-source-connector.adoc         |   5 +-
 .../camel-atomix-map-kafka-sink-connector.adoc     |   5 +-
 .../camel-atomix-map-kafka-source-connector.adoc   |   5 +-
 ...amel-atomix-messaging-kafka-sink-connector.adoc |   5 +-
 ...el-atomix-messaging-kafka-source-connector.adoc |   5 +-
 ...camel-atomix-multimap-kafka-sink-connector.adoc |   5 +-
 .../camel-atomix-queue-kafka-sink-connector.adoc   |   5 +-
 .../camel-atomix-queue-kafka-source-connector.adoc |   5 +-
 .../camel-atomix-set-kafka-sink-connector.adoc     |   5 +-
 .../camel-atomix-set-kafka-source-connector.adoc   |   5 +-
 .../camel-atomix-value-kafka-sink-connector.adoc   |   5 +-
 .../camel-atomix-value-kafka-source-connector.adoc |   5 +-
 .../camel-avro-kafka-sink-connector.adoc           |   5 +-
 .../camel-avro-kafka-source-connector.adoc         |   5 +-
 .../camel-aws-cw-kafka-sink-connector.adoc         |   5 +-
 .../camel-aws-ddb-kafka-sink-connector.adoc        |   5 +-
 ...camel-aws-ddbstream-kafka-source-connector.adoc |   5 +-
 .../camel-aws-ec2-kafka-sink-connector.adoc        |   5 +-
 .../camel-aws-ecs-kafka-sink-connector.adoc        |   5 +-
 .../camel-aws-eks-kafka-sink-connector.adoc        |   5 +-
 .../camel-aws-iam-kafka-sink-connector.adoc        |   5 +-
 ...-aws-kinesis-firehose-kafka-sink-connector.adoc |   5 +-
 .../camel-aws-kinesis-kafka-sink-connector.adoc    |   5 +-
 .../camel-aws-kinesis-kafka-source-connector.adoc  |   5 +-
 .../camel-aws-kms-kafka-sink-connector.adoc        |   5 +-
 .../camel-aws-lambda-kafka-sink-connector.adoc     |   5 +-
 .../camel-aws-mq-kafka-sink-connector.adoc         |   5 +-
 .../camel-aws-msk-kafka-sink-connector.adoc        |   5 +-
 .../camel-aws-s3-kafka-sink-connector.adoc         |   5 +-
 .../camel-aws-s3-kafka-source-connector.adoc       |   5 +-
 .../camel-aws-sdb-kafka-sink-connector.adoc        |   5 +-
 .../camel-aws-ses-kafka-sink-connector.adoc        |   5 +-
 .../camel-aws-sns-kafka-sink-connector.adoc        |   5 +-
 .../camel-aws-sqs-kafka-sink-connector.adoc        |   5 +-
 .../camel-aws-sqs-kafka-source-connector.adoc      |   5 +-
 .../camel-aws-swf-kafka-sink-connector.adoc        |   5 +-
 .../camel-aws-swf-kafka-source-connector.adoc      |   5 +-
 .../camel-aws-translate-kafka-sink-connector.adoc  |   5 +-
 .../camel-aws2-athena-kafka-sink-connector.adoc    |   7 +-
 .../camel-aws2-cw-kafka-sink-connector.adoc        |   7 +-
 .../camel-aws2-ddb-kafka-sink-connector.adoc       |   7 +-
 ...amel-aws2-ddbstream-kafka-source-connector.adoc |   7 +-
 .../camel-aws2-ec2-kafka-sink-connector.adoc       |   7 +-
 .../camel-aws2-ecs-kafka-sink-connector.adoc       |   7 +-
 .../camel-aws2-eks-kafka-sink-connector.adoc       |   7 +-
 ...amel-aws2-eventbridge-kafka-sink-connector.adoc |   7 +-
 .../camel-aws2-iam-kafka-sink-connector.adoc       |   7 +-
 ...aws2-kinesis-firehose-kafka-sink-connector.adoc |   7 +-
 .../camel-aws2-kinesis-kafka-sink-connector.adoc   |   7 +-
 .../camel-aws2-kinesis-kafka-source-connector.adoc |   7 +-
 .../camel-aws2-kms-kafka-sink-connector.adoc       |   7 +-
 .../camel-aws2-lambda-kafka-sink-connector.adoc    |   7 +-
 .../camel-aws2-mq-kafka-sink-connector.adoc        |   7 +-
 .../camel-aws2-msk-kafka-sink-connector.adoc       |   7 +-
 .../camel-aws2-s3-kafka-sink-connector.adoc        |   7 +-
 .../camel-aws2-s3-kafka-source-connector.adoc      |   7 +-
 .../camel-aws2-ses-kafka-sink-connector.adoc       |   7 +-
 .../camel-aws2-sns-kafka-sink-connector.adoc       |   9 +-
 .../camel-aws2-sqs-kafka-sink-connector.adoc       |   7 +-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |   7 +-
 .../camel-aws2-sts-kafka-sink-connector.adoc       |   7 +-
 .../camel-aws2-translate-kafka-sink-connector.adoc |   7 +-
 .../camel-azure-blob-kafka-sink-connector.adoc     |   5 +-
 .../camel-azure-blob-kafka-source-connector.adoc   |   5 +-
 ...camel-azure-eventhubs-kafka-sink-connector.adoc |   5 +-
 ...mel-azure-eventhubs-kafka-source-connector.adoc |   5 +-
 .../camel-azure-queue-kafka-sink-connector.adoc    |   5 +-
 .../camel-azure-queue-kafka-source-connector.adoc  |   5 +-
 ...el-azure-storage-blob-kafka-sink-connector.adoc |   5 +-
 ...-azure-storage-blob-kafka-source-connector.adoc |   5 +-
 ...l-azure-storage-queue-kafka-sink-connector.adoc |   5 +-
 ...azure-storage-queue-kafka-source-connector.adoc |   5 +-
 .../camel-bean-kafka-sink-connector.adoc           |   5 +-
 .../camel-beanstalk-kafka-sink-connector.adoc      |   5 +-
 .../camel-beanstalk-kafka-source-connector.adoc    |   5 +-
 .../connectors/camel-box-kafka-sink-connector.adoc |   5 +-
 .../camel-box-kafka-source-connector.adoc          |   5 +-
 .../camel-braintree-kafka-sink-connector.adoc      |   5 +-
 .../camel-caffeine-cache-kafka-sink-connector.adoc |   5 +-
 ...el-caffeine-loadcache-kafka-sink-connector.adoc |   5 +-
 .../camel-chatscript-kafka-sink-connector.adoc     |   5 +-
 .../camel-chunk-kafka-sink-connector.adoc          |   5 +-
 .../camel-cm-sms-kafka-sink-connector.adoc         |   5 +-
 .../camel-cmis-kafka-sink-connector.adoc           |   5 +-
 .../camel-cmis-kafka-source-connector.adoc         |   5 +-
 .../camel-coap+tcp-kafka-sink-connector.adoc       |   5 +-
 .../camel-coap+tcp-kafka-source-connector.adoc     |   5 +-
 .../camel-coap-kafka-sink-connector.adoc           |   5 +-
 .../camel-coap-kafka-source-connector.adoc         |   5 +-
 .../camel-coaps+tcp-kafka-sink-connector.adoc      |   5 +-
 .../camel-coaps+tcp-kafka-source-connector.adoc    |   5 +-
 .../camel-coaps-kafka-sink-connector.adoc          |   5 +-
 .../camel-coaps-kafka-source-connector.adoc        |   5 +-
 .../camel-cometd-kafka-sink-connector.adoc         |   5 +-
 .../camel-cometd-kafka-source-connector.adoc       |   5 +-
 .../camel-cometds-kafka-sink-connector.adoc        |   5 +-
 .../camel-cometds-kafka-source-connector.adoc      |   5 +-
 .../camel-consul-kafka-sink-connector.adoc         |   5 +-
 .../camel-consul-kafka-source-connector.adoc       |   5 +-
 .../camel-controlbus-kafka-sink-connector.adoc     |   5 +-
 .../camel-corda-kafka-sink-connector.adoc          |   5 +-
 .../camel-corda-kafka-source-connector.adoc        |   5 +-
 .../camel-couchbase-kafka-sink-connector.adoc      |   4 +-
 .../camel-couchbase-kafka-source-connector.adoc    |   7 +-
 .../camel-couchdb-kafka-sink-connector.adoc        |   5 +-
 .../camel-couchdb-kafka-source-connector.adoc      |   5 +-
 .../connectors/camel-cql-kafka-sink-connector.adoc |   5 +-
 .../camel-cql-kafka-source-connector.adoc          |   5 +-
 .../camel-cron-kafka-source-connector.adoc         |   5 +-
 .../camel-crypto-cms-kafka-sink-connector.adoc     |   5 +-
 .../camel-crypto-kafka-sink-connector.adoc         |   5 +-
 .../connectors/camel-cxf-kafka-sink-connector.adoc |   5 +-
 .../camel-cxf-kafka-source-connector.adoc          |   5 +-
 .../camel-cxfrs-kafka-sink-connector.adoc          |   5 +-
 .../camel-cxfrs-kafka-source-connector.adoc        |   5 +-
 .../camel-dataformat-kafka-sink-connector.adoc     |   5 +-
 .../camel-direct-kafka-sink-connector.adoc         |   5 +-
 .../camel-direct-kafka-source-connector.adoc       |   5 +-
 .../camel-direct-vm-kafka-sink-connector.adoc      |   5 +-
 .../camel-direct-vm-kafka-source-connector.adoc    |   5 +-
 .../camel-disruptor-kafka-sink-connector.adoc      |   5 +-
 .../camel-disruptor-kafka-source-connector.adoc    |   5 +-
 .../camel-disruptor-vm-kafka-sink-connector.adoc   |   5 +-
 .../camel-disruptor-vm-kafka-source-connector.adoc |   5 +-
 .../connectors/camel-djl-kafka-sink-connector.adoc |   5 +-
 .../connectors/camel-dns-kafka-sink-connector.adoc |   5 +-
 .../camel-docker-kafka-sink-connector.adoc         |   5 +-
 .../camel-docker-kafka-source-connector.adoc       |   5 +-
 .../camel-dozer-kafka-sink-connector.adoc          |   5 +-
 .../camel-drill-kafka-sink-connector.adoc          |   5 +-
 .../camel-dropbox-kafka-sink-connector.adoc        |   5 +-
 .../camel-dropbox-kafka-source-connector.adoc      |   5 +-
 .../camel-ehcache-kafka-sink-connector.adoc        |   5 +-
 .../camel-ehcache-kafka-source-connector.adoc      |   5 +-
 ...el-elasticsearch-rest-kafka-sink-connector.adoc |   5 +-
 .../camel-elsql-kafka-sink-connector.adoc          |   5 +-
 .../camel-elsql-kafka-source-connector.adoc        |   5 +-
 .../camel-etcd-keys-kafka-sink-connector.adoc      |   5 +-
 .../camel-etcd-stats-kafka-sink-connector.adoc     |   5 +-
 .../camel-etcd-stats-kafka-source-connector.adoc   |   5 +-
 .../camel-etcd-watch-kafka-source-connector.adoc   |   5 +-
 .../camel-exec-kafka-sink-connector.adoc           |   5 +-
 .../camel-facebook-kafka-sink-connector.adoc       |   5 +-
 .../camel-facebook-kafka-source-connector.adoc     |   5 +-
 .../camel-fhir-kafka-sink-connector.adoc           |   5 +-
 .../camel-fhir-kafka-source-connector.adoc         |   5 +-
 .../camel-file-kafka-sink-connector.adoc           |   5 +-
 .../camel-file-kafka-source-connector.adoc         |   5 +-
 .../camel-file-watch-kafka-source-connector.adoc   |   5 +-
 .../camel-flatpack-kafka-sink-connector.adoc       |   5 +-
 .../camel-flatpack-kafka-source-connector.adoc     |   5 +-
 .../camel-flink-kafka-sink-connector.adoc          |   5 +-
 .../connectors/camel-fop-kafka-sink-connector.adoc |   5 +-
 .../camel-freemarker-kafka-sink-connector.adoc     |   5 +-
 .../connectors/camel-ftp-kafka-sink-connector.adoc |   5 +-
 .../camel-ftp-kafka-source-connector.adoc          |   5 +-
 .../camel-ftps-kafka-sink-connector.adoc           |   5 +-
 .../camel-ftps-kafka-source-connector.adoc         |   5 +-
 .../camel-ganglia-kafka-sink-connector.adoc        |   5 +-
 .../camel-geocoder-kafka-sink-connector.adoc       |   5 +-
 .../connectors/camel-git-kafka-sink-connector.adoc |   5 +-
 .../camel-git-kafka-source-connector.adoc          |   5 +-
 .../camel-github-kafka-sink-connector.adoc         |   7 +-
 .../camel-github-kafka-source-connector.adoc       |  24 +++-
 ...camel-google-bigquery-kafka-sink-connector.adoc |   9 +-
 ...l-google-bigquery-sql-kafka-sink-connector.adoc |   9 +-
 ...camel-google-calendar-kafka-sink-connector.adoc |   5 +-
 ...mel-google-calendar-kafka-source-connector.adoc |   5 +-
 ...gle-calendar-stream-kafka-source-connector.adoc |   5 +-
 .../camel-google-drive-kafka-sink-connector.adoc   |   5 +-
 .../camel-google-drive-kafka-source-connector.adoc |   5 +-
 .../camel-google-mail-kafka-sink-connector.adoc    |   5 +-
 .../camel-google-mail-kafka-source-connector.adoc  |   5 +-
 ...-google-mail-stream-kafka-source-connector.adoc |   5 +-
 .../camel-google-pubsub-kafka-sink-connector.adoc  |   4 +-
 ...camel-google-pubsub-kafka-source-connector.adoc |   5 +-
 .../camel-google-sheets-kafka-sink-connector.adoc  |   5 +-
 ...camel-google-sheets-kafka-source-connector.adoc |   5 +-
 ...oogle-sheets-stream-kafka-source-connector.adoc |   5 +-
 .../camel-gora-kafka-sink-connector.adoc           |   5 +-
 .../camel-gora-kafka-source-connector.adoc         |   5 +-
 .../camel-grape-kafka-sink-connector.adoc          |   5 +-
 .../camel-graphql-kafka-sink-connector.adoc        |   5 +-
 .../camel-grpc-kafka-sink-connector.adoc           |   5 +-
 .../camel-grpc-kafka-source-connector.adoc         |   5 +-
 .../camel-guava-eventbus-kafka-sink-connector.adoc |   5 +-
 ...amel-guava-eventbus-kafka-source-connector.adoc |   5 +-
 ...hazelcast-atomicvalue-kafka-sink-connector.adoc |   5 +-
 ...-hazelcast-instance-kafka-source-connector.adoc |   5 +-
 .../camel-hazelcast-list-kafka-sink-connector.adoc |   5 +-
 ...amel-hazelcast-list-kafka-source-connector.adoc |   5 +-
 .../camel-hazelcast-map-kafka-sink-connector.adoc  |   5 +-
 ...camel-hazelcast-map-kafka-source-connector.adoc |   5 +-
 ...el-hazelcast-multimap-kafka-sink-connector.adoc |   5 +-
 ...-hazelcast-multimap-kafka-source-connector.adoc |   5 +-
 ...camel-hazelcast-queue-kafka-sink-connector.adoc |   5 +-
 ...mel-hazelcast-queue-kafka-source-connector.adoc |   5 +-
 ...zelcast-replicatedmap-kafka-sink-connector.adoc |   5 +-
 ...lcast-replicatedmap-kafka-source-connector.adoc |   5 +-
 ...-hazelcast-ringbuffer-kafka-sink-connector.adoc |   5 +-
 .../camel-hazelcast-seda-kafka-sink-connector.adoc |   5 +-
 ...amel-hazelcast-seda-kafka-source-connector.adoc |   5 +-
 .../camel-hazelcast-set-kafka-sink-connector.adoc  |   5 +-
 ...camel-hazelcast-set-kafka-source-connector.adoc |   5 +-
 ...camel-hazelcast-topic-kafka-sink-connector.adoc |   5 +-
 ...mel-hazelcast-topic-kafka-source-connector.adoc |   5 +-
 .../camel-hbase-kafka-sink-connector.adoc          |   5 +-
 .../camel-hbase-kafka-source-connector.adoc        |   5 +-
 .../camel-hdfs-kafka-sink-connector.adoc           |   5 +-
 .../camel-hdfs-kafka-source-connector.adoc         |   5 +-
 .../camel-http-kafka-sink-connector.adoc           |   5 +-
 .../camel-https-kafka-sink-connector.adoc          |   5 +-
 ...camel-iec60870-client-kafka-sink-connector.adoc |   5 +-
 ...mel-iec60870-client-kafka-source-connector.adoc |   5 +-
 ...camel-iec60870-server-kafka-sink-connector.adoc |   5 +-
 ...mel-iec60870-server-kafka-source-connector.adoc |   5 +-
 .../camel-ignite-cache-kafka-sink-connector.adoc   |   5 +-
 .../camel-ignite-cache-kafka-source-connector.adoc |   5 +-
 .../camel-ignite-compute-kafka-sink-connector.adoc |   5 +-
 ...camel-ignite-events-kafka-source-connector.adoc |   5 +-
 .../camel-ignite-idgen-kafka-sink-connector.adoc   |   5 +-
 ...amel-ignite-messaging-kafka-sink-connector.adoc |   5 +-
 ...el-ignite-messaging-kafka-source-connector.adoc |   5 +-
 .../camel-ignite-queue-kafka-sink-connector.adoc   |   5 +-
 .../camel-ignite-set-kafka-sink-connector.adoc     |   5 +-
 .../camel-imap-kafka-sink-connector.adoc           |   5 +-
 .../camel-imap-kafka-source-connector.adoc         |   5 +-
 .../camel-imaps-kafka-sink-connector.adoc          |   5 +-
 .../camel-imaps-kafka-source-connector.adoc        |   5 +-
 .../camel-infinispan-kafka-sink-connector.adoc     |   5 +-
 .../camel-infinispan-kafka-source-connector.adoc   |   5 +-
 .../camel-influxdb-kafka-sink-connector.adoc       |   5 +-
 .../camel-iota-kafka-sink-connector.adoc           |   5 +-
 .../camel-ipfs-kafka-sink-connector.adoc           |   5 +-
 .../connectors/camel-irc-kafka-sink-connector.adoc |   5 +-
 .../camel-irc-kafka-source-connector.adoc          |   5 +-
 .../camel-ironmq-kafka-sink-connector.adoc         |   5 +-
 .../camel-ironmq-kafka-source-connector.adoc       |   5 +-
 .../camel-jbpm-kafka-sink-connector.adoc           |   5 +-
 .../camel-jbpm-kafka-source-connector.adoc         |   5 +-
 .../camel-jcache-kafka-sink-connector.adoc         |   5 +-
 .../camel-jcache-kafka-source-connector.adoc       |   5 +-
 .../camel-jclouds-kafka-sink-connector.adoc        |   5 +-
 .../camel-jclouds-kafka-source-connector.adoc      |   5 +-
 .../connectors/camel-jcr-kafka-sink-connector.adoc |   5 +-
 .../camel-jcr-kafka-source-connector.adoc          |   5 +-
 .../camel-jdbc-kafka-sink-connector.adoc           |   5 +-
 .../camel-jetty-kafka-source-connector.adoc        |   7 +-
 .../camel-jgroups-kafka-sink-connector.adoc        |   5 +-
 .../camel-jgroups-kafka-source-connector.adoc      |   5 +-
 .../camel-jgroups-raft-kafka-sink-connector.adoc   |   5 +-
 .../camel-jgroups-raft-kafka-source-connector.adoc |   5 +-
 .../camel-jing-kafka-sink-connector.adoc           |   5 +-
 .../camel-jira-kafka-sink-connector.adoc           |   5 +-
 .../camel-jira-kafka-source-connector.adoc         |   5 +-
 .../connectors/camel-jms-kafka-sink-connector.adoc |   5 +-
 .../camel-jms-kafka-source-connector.adoc          |   5 +-
 .../camel-jmx-kafka-source-connector.adoc          |   5 +-
 .../camel-jolt-kafka-sink-connector.adoc           |   5 +-
 .../camel-jooq-kafka-sink-connector.adoc           |   5 +-
 .../camel-jooq-kafka-source-connector.adoc         |   5 +-
 .../connectors/camel-jpa-kafka-sink-connector.adoc |   5 +-
 .../camel-jpa-kafka-source-connector.adoc          |   5 +-
 .../camel-jslt-kafka-sink-connector.adoc           |   5 +-
 .../camel-json-validator-kafka-sink-connector.adoc |   5 +-
 .../camel-jsonata-kafka-sink-connector.adoc        |   5 +-
 .../camel-jt400-kafka-sink-connector.adoc          |   5 +-
 .../camel-jt400-kafka-source-connector.adoc        |   5 +-
 .../camel-kafka-kafka-sink-connector.adoc          |   5 +-
 .../camel-kafka-kafka-source-connector.adoc        |   5 +-
 ...ubernetes-config-maps-kafka-sink-connector.adoc |   5 +-
 ...etes-custom-resources-kafka-sink-connector.adoc |   9 +-
 ...es-custom-resources-kafka-source-connector.adoc |   9 +-
 ...ubernetes-deployments-kafka-sink-connector.adoc |   5 +-
 ...ernetes-deployments-kafka-source-connector.adoc |   5 +-
 .../camel-kubernetes-hpa-kafka-sink-connector.adoc |   5 +-
 ...amel-kubernetes-hpa-kafka-source-connector.adoc |   5 +-
 .../camel-kubernetes-job-kafka-sink-connector.adoc |   5 +-
 ...amel-kubernetes-job-kafka-source-connector.adoc |   5 +-
 ...kubernetes-namespaces-kafka-sink-connector.adoc |   5 +-
 ...bernetes-namespaces-kafka-source-connector.adoc |   5 +-
 ...amel-kubernetes-nodes-kafka-sink-connector.adoc |   5 +-
 ...el-kubernetes-nodes-kafka-source-connector.adoc |   5 +-
 ...istent-volumes-claims-kafka-sink-connector.adoc |   5 +-
 ...es-persistent-volumes-kafka-sink-connector.adoc |   5 +-
 ...camel-kubernetes-pods-kafka-sink-connector.adoc |   5 +-
 ...mel-kubernetes-pods-kafka-source-connector.adoc |   5 +-
 ...plication-controllers-kafka-sink-connector.adoc |   5 +-
 ...ication-controllers-kafka-source-connector.adoc |   5 +-
 ...netes-resources-quota-kafka-sink-connector.adoc |   5 +-
 ...el-kubernetes-secrets-kafka-sink-connector.adoc |   5 +-
 ...etes-service-accounts-kafka-sink-connector.adoc |   5 +-
 ...l-kubernetes-services-kafka-sink-connector.adoc |   5 +-
 ...kubernetes-services-kafka-source-connector.adoc |   5 +-
 .../camel-kudu-kafka-sink-connector.adoc           |   5 +-
 .../camel-language-kafka-sink-connector.adoc       |   5 +-
 .../camel-ldap-kafka-sink-connector.adoc           |   5 +-
 .../camel-ldif-kafka-sink-connector.adoc           |   5 +-
 .../connectors/camel-log-kafka-sink-connector.adoc |   5 +-
 .../connectors/camel-lpr-kafka-sink-connector.adoc |   5 +-
 .../camel-lucene-kafka-sink-connector.adoc         |   5 +-
 .../camel-lumberjack-kafka-source-connector.adoc   |   5 +-
 .../camel-master-kafka-source-connector.adoc       |   5 +-
 .../camel-metrics-kafka-sink-connector.adoc        |   5 +-
 .../camel-micrometer-kafka-sink-connector.adoc     |   5 +-
 ...-microprofile-metrics-kafka-sink-connector.adoc |   5 +-
 .../camel-milo-client-kafka-sink-connector.adoc    |   5 +-
 .../camel-milo-client-kafka-source-connector.adoc  |   5 +-
 .../camel-milo-server-kafka-sink-connector.adoc    |   5 +-
 .../camel-milo-server-kafka-source-connector.adoc  |   5 +-
 .../camel-mina-kafka-sink-connector.adoc           |   5 +-
 .../camel-mina-kafka-source-connector.adoc         |   5 +-
 .../camel-minio-kafka-sink-connector.adoc          |   5 +-
 .../camel-minio-kafka-source-connector.adoc        |   5 +-
 .../camel-mllp-kafka-sink-connector.adoc           |   5 +-
 .../camel-mllp-kafka-source-connector.adoc         |   5 +-
 .../camel-mongodb-gridfs-kafka-sink-connector.adoc |   5 +-
 ...amel-mongodb-gridfs-kafka-source-connector.adoc |   5 +-
 .../camel-mongodb-kafka-sink-connector.adoc        |   5 +-
 .../camel-mongodb-kafka-source-connector.adoc      |   5 +-
 .../connectors/camel-msv-kafka-sink-connector.adoc |   5 +-
 .../camel-mustache-kafka-sink-connector.adoc       |   5 +-
 .../camel-mvel-kafka-sink-connector.adoc           |   5 +-
 .../camel-mybatis-bean-kafka-sink-connector.adoc   |   5 +-
 .../camel-mybatis-kafka-sink-connector.adoc        |   5 +-
 .../camel-mybatis-kafka-source-connector.adoc      |   5 +-
 .../camel-nagios-kafka-sink-connector.adoc         |   5 +-
 .../camel-nats-kafka-sink-connector.adoc           |   4 +-
 .../camel-nats-kafka-source-connector.adoc         |   4 +-
 .../camel-netty-http-kafka-sink-connector.adoc     |   5 +-
 .../camel-netty-http-kafka-source-connector.adoc   |   5 +-
 .../camel-netty-kafka-sink-connector.adoc          |   5 +-
 .../camel-netty-kafka-source-connector.adoc        |   5 +-
 .../camel-nitrite-kafka-sink-connector.adoc        |   5 +-
 .../camel-nitrite-kafka-source-connector.adoc      |   5 +-
 .../connectors/camel-nsq-kafka-sink-connector.adoc |   5 +-
 .../camel-nsq-kafka-source-connector.adoc          |   5 +-
 .../camel-oaipmh-kafka-sink-connector.adoc         |   5 +-
 .../camel-oaipmh-kafka-source-connector.adoc       |   5 +-
 .../camel-olingo2-kafka-sink-connector.adoc        |   5 +-
 .../camel-olingo2-kafka-source-connector.adoc      |   5 +-
 .../camel-olingo4-kafka-sink-connector.adoc        |   5 +-
 .../camel-olingo4-kafka-source-connector.adoc      |   5 +-
 ...enshift-build-configs-kafka-sink-connector.adoc |   5 +-
 ...amel-openshift-builds-kafka-sink-connector.adoc |   5 +-
 ...amel-openstack-cinder-kafka-sink-connector.adoc |   5 +-
 ...amel-openstack-glance-kafka-sink-connector.adoc |   5 +-
 ...el-openstack-keystone-kafka-sink-connector.adoc |   5 +-
 ...mel-openstack-neutron-kafka-sink-connector.adoc |   5 +-
 .../camel-openstack-nova-kafka-sink-connector.adoc |   5 +-
 ...camel-openstack-swift-kafka-sink-connector.adoc |   5 +-
 .../camel-optaplanner-kafka-sink-connector.adoc    |   5 +-
 .../camel-optaplanner-kafka-source-connector.adoc  |   5 +-
 .../camel-paho-kafka-sink-connector.adoc           |   5 +-
 .../camel-paho-kafka-source-connector.adoc         |   5 +-
 .../connectors/camel-pdf-kafka-sink-connector.adoc |   5 +-
 ...pg-replication-slot-kafka-source-connector.adoc |   5 +-
 .../camel-pgevent-kafka-sink-connector.adoc        |   5 +-
 .../camel-pgevent-kafka-source-connector.adoc      |   5 +-
 ...camel-platform-http-kafka-source-connector.adoc |   5 +-
 .../camel-pop3-kafka-sink-connector.adoc           |   5 +-
 .../camel-pop3-kafka-source-connector.adoc         |   5 +-
 .../camel-pop3s-kafka-sink-connector.adoc          |   5 +-
 .../camel-pop3s-kafka-source-connector.adoc        |   5 +-
 .../camel-pubnub-kafka-sink-connector.adoc         |   5 +-
 .../camel-pubnub-kafka-source-connector.adoc       |   5 +-
 .../camel-pulsar-kafka-sink-connector.adoc         |   5 +-
 .../camel-pulsar-kafka-source-connector.adoc       |   5 +-
 .../camel-quartz-kafka-source-connector.adoc       |   5 +-
 .../camel-quickfix-kafka-sink-connector.adoc       |   5 +-
 .../camel-quickfix-kafka-source-connector.adoc     |   5 +-
 .../camel-rabbitmq-kafka-sink-connector.adoc       |   5 +-
 .../camel-rabbitmq-kafka-source-connector.adoc     |   5 +-
 ...amel-reactive-streams-kafka-sink-connector.adoc |   5 +-
 ...el-reactive-streams-kafka-source-connector.adoc |   5 +-
 .../camel-rest-api-kafka-source-connector.adoc     |   5 +-
 .../camel-rest-kafka-sink-connector.adoc           |   5 +-
 .../camel-rest-kafka-source-connector.adoc         |   5 +-
 .../camel-rest-openapi-kafka-sink-connector.adoc   |   5 +-
 .../camel-rest-swagger-kafka-sink-connector.adoc   |   5 +-
 .../camel-resteasy-kafka-sink-connector.adoc       |   5 +-
 .../camel-resteasy-kafka-source-connector.adoc     |   5 +-
 .../camel-rss-kafka-source-connector.adoc          |   5 +-
 .../camel-saga-kafka-sink-connector.adoc           |   5 +-
 .../camel-salesforce-kafka-sink-connector.adoc     |   5 +-
 .../camel-salesforce-kafka-source-connector.adoc   |   5 +-
 .../camel-sap-netweaver-kafka-sink-connector.adoc  |   5 +-
 .../camel-scheduler-kafka-source-connector.adoc    |   5 +-
 .../camel-schematron-kafka-sink-connector.adoc     |   5 +-
 .../connectors/camel-scp-kafka-sink-connector.adoc |   5 +-
 .../camel-seda-kafka-sink-connector.adoc           |   5 +-
 .../camel-seda-kafka-source-connector.adoc         |   5 +-
 .../camel-service-kafka-source-connector.adoc      |   5 +-
 .../camel-servicenow-kafka-sink-connector.adoc     |   5 +-
 .../camel-servlet-kafka-source-connector.adoc      |   5 +-
 .../camel-sftp-kafka-sink-connector.adoc           |   5 +-
 .../camel-sftp-kafka-source-connector.adoc         |   5 +-
 .../connectors/camel-sip-kafka-sink-connector.adoc |   5 +-
 .../camel-sip-kafka-source-connector.adoc          |   5 +-
 .../camel-sips-kafka-sink-connector.adoc           |   5 +-
 .../camel-sips-kafka-source-connector.adoc         |   5 +-
 .../camel-sjms-batch-kafka-source-connector.adoc   |   5 +-
 .../camel-sjms-kafka-sink-connector.adoc           |   7 +-
 .../camel-sjms-kafka-source-connector.adoc         |   7 +-
 .../camel-sjms2-kafka-sink-connector.adoc          |   7 +-
 .../camel-sjms2-kafka-source-connector.adoc        |   7 +-
 .../camel-slack-kafka-sink-connector.adoc          |   5 +-
 .../camel-slack-kafka-source-connector.adoc        |   5 +-
 .../camel-smpp-kafka-sink-connector.adoc           |   5 +-
 .../camel-smpp-kafka-source-connector.adoc         |   5 +-
 .../camel-smpps-kafka-sink-connector.adoc          |   5 +-
 .../camel-smpps-kafka-source-connector.adoc        |   5 +-
 .../camel-smtp-kafka-sink-connector.adoc           |   5 +-
 .../camel-smtp-kafka-source-connector.adoc         |   5 +-
 .../camel-smtps-kafka-sink-connector.adoc          |   5 +-
 .../camel-smtps-kafka-source-connector.adoc        |   5 +-
 .../camel-snmp-kafka-sink-connector.adoc           |   5 +-
 .../camel-snmp-kafka-source-connector.adoc         |   5 +-
 .../camel-solr-kafka-sink-connector.adoc           |   5 +-
 .../camel-solrCloud-kafka-sink-connector.adoc      |   5 +-
 .../camel-solrs-kafka-sink-connector.adoc          |   5 +-
 .../camel-soroush-kafka-sink-connector.adoc        |   5 +-
 .../camel-soroush-kafka-source-connector.adoc      |   5 +-
 .../camel-spark-kafka-sink-connector.adoc          |   5 +-
 .../camel-splunk-hec-kafka-sink-connector.adoc     |   5 +-
 .../camel-splunk-kafka-sink-connector.adoc         |   5 +-
 .../camel-splunk-kafka-source-connector.adoc       |   5 +-
 .../camel-spring-batch-kafka-sink-connector.adoc   |   5 +-
 .../camel-spring-event-kafka-sink-connector.adoc   |   5 +-
 .../camel-spring-event-kafka-source-connector.adoc |   5 +-
 ...el-spring-integration-kafka-sink-connector.adoc |   5 +-
 ...-spring-integration-kafka-source-connector.adoc |   5 +-
 .../camel-spring-ldap-kafka-sink-connector.adoc    |   5 +-
 .../camel-spring-redis-kafka-sink-connector.adoc   |   5 +-
 .../camel-spring-redis-kafka-source-connector.adoc |   5 +-
 .../camel-spring-ws-kafka-sink-connector.adoc      |   5 +-
 .../camel-spring-ws-kafka-source-connector.adoc    |   5 +-
 .../connectors/camel-sql-kafka-sink-connector.adoc |   5 +-
 .../camel-sql-kafka-source-connector.adoc          |   5 +-
 .../camel-sql-stored-kafka-sink-connector.adoc     |   5 +-
 .../connectors/camel-ssh-kafka-sink-connector.adoc |   5 +-
 .../camel-ssh-kafka-source-connector.adoc          |   5 +-
 .../camel-stax-kafka-sink-connector.adoc           |   5 +-
 .../camel-stomp-kafka-sink-connector.adoc          |   5 +-
 .../camel-stomp-kafka-source-connector.adoc        |   5 +-
 .../camel-stream-kafka-sink-connector.adoc         |   5 +-
 .../camel-stream-kafka-source-connector.adoc       |   5 +-
 ...camel-string-template-kafka-sink-connector.adoc |   5 +-
 .../camel-stub-kafka-sink-connector.adoc           |   5 +-
 .../camel-stub-kafka-source-connector.adoc         |   5 +-
 .../camel-telegram-kafka-sink-connector.adoc       |   5 +-
 .../camel-telegram-kafka-source-connector.adoc     |   5 +-
 .../camel-thrift-kafka-sink-connector.adoc         |   5 +-
 .../camel-thrift-kafka-source-connector.adoc       |   5 +-
 .../camel-tika-kafka-sink-connector.adoc           |   5 +-
 .../camel-timer-kafka-source-connector.adoc        |   5 +-
 .../camel-twilio-kafka-sink-connector.adoc         |   5 +-
 .../camel-twilio-kafka-source-connector.adoc       |   5 +-
 ...twitter-directmessage-kafka-sink-connector.adoc |   5 +-
 ...itter-directmessage-kafka-source-connector.adoc |   5 +-
 .../camel-twitter-search-kafka-sink-connector.adoc |   5 +-
 ...amel-twitter-search-kafka-source-connector.adoc |   5 +-
 ...amel-twitter-timeline-kafka-sink-connector.adoc |   5 +-
 ...el-twitter-timeline-kafka-source-connector.adoc |   5 +-
 .../camel-undertow-kafka-sink-connector.adoc       |   5 +-
 .../camel-undertow-kafka-source-connector.adoc     |   5 +-
 .../camel-validator-kafka-sink-connector.adoc      |   5 +-
 .../camel-velocity-kafka-sink-connector.adoc       |   5 +-
 .../camel-vertx-http-kafka-sink-connector.adoc     |   5 +-
 .../camel-vertx-kafka-sink-connector.adoc          |   5 +-
 .../camel-vertx-kafka-source-connector.adoc        |   5 +-
 ...camel-vertx-websocket-kafka-sink-connector.adoc |   5 +-
 ...mel-vertx-websocket-kafka-source-connector.adoc |   5 +-
 .../connectors/camel-vm-kafka-sink-connector.adoc  |   5 +-
 .../camel-vm-kafka-source-connector.adoc           |   5 +-
 .../camel-weather-kafka-sink-connector.adoc        |   5 +-
 .../camel-weather-kafka-source-connector.adoc      |   5 +-
 .../camel-web3j-kafka-sink-connector.adoc          |   5 +-
 .../camel-web3j-kafka-source-connector.adoc        |   5 +-
 .../camel-webhook-kafka-source-connector.adoc      |   5 +-
 ...amel-websocket-jsr356-kafka-sink-connector.adoc |   5 +-
 ...el-websocket-jsr356-kafka-source-connector.adoc |   5 +-
 .../camel-websocket-kafka-sink-connector.adoc      |   5 +-
 .../camel-websocket-kafka-source-connector.adoc    |   5 +-
 .../camel-weka-kafka-sink-connector.adoc           |   5 +-
 .../camel-wordpress-kafka-sink-connector.adoc      |   5 +-
 .../camel-wordpress-kafka-source-connector.adoc    |   5 +-
 .../camel-workday-kafka-sink-connector.adoc        |   5 +-
 .../camel-xchange-kafka-sink-connector.adoc        |   5 +-
 .../connectors/camel-xj-kafka-sink-connector.adoc  |   5 +-
 ...amel-xmlsecurity-sign-kafka-sink-connector.adoc |   5 +-
 ...el-xmlsecurity-verify-kafka-sink-connector.adoc |   5 +-
 .../camel-xmpp-kafka-sink-connector.adoc           |   5 +-
 .../camel-xmpp-kafka-source-connector.adoc         |   5 +-
 .../camel-xquery-kafka-sink-connector.adoc         |   5 +-
 .../camel-xquery-kafka-source-connector.adoc       |   5 +-
 .../camel-xslt-kafka-sink-connector.adoc           |   5 +-
 .../camel-xslt-saxon-kafka-sink-connector.adoc     |   5 +-
 .../camel-yammer-kafka-sink-connector.adoc         |   5 +-
 .../camel-yammer-kafka-source-connector.adoc       |   5 +-
 .../camel-zendesk-kafka-sink-connector.adoc        |   5 +-
 .../camel-zendesk-kafka-source-connector.adoc      |   5 +-
 .../camel-zookeeper-kafka-sink-connector.adoc      |   5 +-
 .../camel-zookeeper-kafka-source-connector.adoc    |   5 +-
 ...el-zookeeper-master-kafka-source-connector.adoc |   5 +-
 2128 files changed, 7338 insertions(+), 14689 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json
index c372562..498bb23 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.overrideEndpoint": {
 			"name": "camel.sink.endpoint.overrideEndpoint",
 			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
@@ -184,13 +177,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -223,13 +209,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.autoDiscoverClient": {
-			"name": "camel.component.aws2-s3.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-s3.configuration": {
 			"name": "camel.component.aws2-s3.configuration",
 			"description": "The component configuration",
@@ -385,11 +364,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.basicPropertyBinding": {
-			"name": "camel.component.aws2-s3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-s3.autowiredEnabled": {
+			"name": "camel.component.aws2-s3.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-s3.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
index ce8dd68..b79d280 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.autoDiscoverClient": {
-			"name": "camel.source.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.overrideEndpoint": {
 			"name": "camel.source.endpoint.overrideEndpoint",
 			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
@@ -235,13 +228,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -367,13 +353,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.autoDiscoverClient": {
-			"name": "camel.component.aws2-s3.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-s3.configuration": {
 			"name": "camel.component.aws2-s3.configuration",
 			"description": "The component configuration",
@@ -541,11 +520,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.basicPropertyBinding": {
-			"name": "camel.component.aws2-s3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-s3.autowiredEnabled": {
+			"name": "camel.component.aws2-s3.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-s3.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json
index 929c8c4..b0b6cef 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json
@@ -163,13 +163,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.channelGroup": {
 			"name": "camel.sink.endpoint.channelGroup",
 			"description": "To use a explicit ChannelGroup.",
@@ -512,11 +505,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.netty.basicPropertyBinding": {
-			"name": "camel.component.netty.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.netty.autowiredEnabled": {
+			"name": "camel.component.netty.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.netty.channelGroup": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-source.json
index 6984a7a..a8b8db6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-source.json
@@ -195,13 +195,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.channelGroup": {
 			"name": "camel.source.endpoint.channelGroup",
 			"description": "To use a explicit ChannelGroup.",
@@ -583,11 +576,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.netty.basicPropertyBinding": {
-			"name": "camel.component.netty.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.netty.autowiredEnabled": {
+			"name": "camel.component.netty.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.netty.channelGroup": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-workday-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-workday-sink.json
index 6929def..f2199c9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-workday-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-workday-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.httpConnectionManager": {
 			"name": "camel.sink.endpoint.httpConnectionManager",
 			"description": "Pool connection manager for advanced configuration.",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.workday.basicPropertyBinding": {
-			"name": "camel.component.workday.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.workday.autowiredEnabled": {
+			"name": "camel.component.workday.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xchange-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xchange-sink.json
index 0a42f54..54cd741 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xchange-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xchange-sink.json
@@ -46,13 +46,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -67,11 +60,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xchange.basicPropertyBinding": {
-			"name": "camel.component.xchange.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xchange.autowiredEnabled": {
+			"name": "camel.component.xchange.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xj-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xj-sink.json
index 489d52a..401db70 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xj-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xj-sink.json
@@ -70,13 +70,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.entityResolver": {
 			"name": "camel.sink.endpoint.entityResolver",
 			"description": "To use a custom org.xml.sax.EntityResolver with javax.xml.transform.sax.SAXSource.",
@@ -152,11 +145,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xj.basicPropertyBinding": {
-			"name": "camel.component.xj.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xj.autowiredEnabled": {
+			"name": "camel.component.xj.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xj.saxonConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-sign-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-sign-sink.json
index 41b424a..cf62490 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-sign-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-sign-sink.json
@@ -181,13 +181,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -367,11 +360,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xmlsecurity-sign.basicPropertyBinding": {
-			"name": "camel.component.xmlsecurity-sign.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xmlsecurity-sign.autowiredEnabled": {
+			"name": "camel.component.xmlsecurity-sign.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xmlsecurity-sign.signerConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-verify-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-verify-sink.json
index 6f00d9a..fb096a9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-verify-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-verify-sink.json
@@ -118,13 +118,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -241,11 +234,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xmlsecurity-verify.basicPropertyBinding": {
-			"name": "camel.component.xmlsecurity-verify.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xmlsecurity-verify.autowiredEnabled": {
+			"name": "camel.component.xmlsecurity-verify.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xmlsecurity-verify.uriDereferencer": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-sink.json
index 0764876..aaf02a1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-sink.json
@@ -87,13 +87,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionConfig": {
 			"name": "camel.sink.endpoint.connectionConfig",
 			"description": "To use an existing connection configuration. Currently org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration is only supported (XMPP over TCP).",
@@ -138,11 +131,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xmpp.basicPropertyBinding": {
-			"name": "camel.component.xmpp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xmpp.autowiredEnabled": {
+			"name": "camel.component.xmpp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-source.json
index bfa1ae0..9ec64b8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-source.json
@@ -113,13 +113,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionConfig": {
 			"name": "camel.source.endpoint.connectionConfig",
 			"description": "To use an existing connection configuration. Currently org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration is only supported (XMPP over TCP).",
@@ -164,11 +157,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xmpp.basicPropertyBinding": {
-			"name": "camel.component.xmpp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xmpp.autowiredEnabled": {
+			"name": "camel.component.xmpp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-sink.json
index 0ee662a..63aae3c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-sink.json
@@ -61,13 +61,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.configuration": {
 			"name": "camel.sink.endpoint.configuration",
 			"description": "To use a custom Saxon configuration",
@@ -118,11 +111,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xquery.basicPropertyBinding": {
-			"name": "camel.component.xquery.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xquery.autowiredEnabled": {
+			"name": "camel.component.xquery.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xquery.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-source.json
index 7892d4f..550e6d1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-source.json
@@ -86,13 +86,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.configuration": {
 			"name": "camel.source.endpoint.configuration",
 			"description": "To use a custom Saxon configuration",
@@ -236,11 +229,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xquery.basicPropertyBinding": {
-			"name": "camel.component.xquery.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xquery.autowiredEnabled": {
+			"name": "camel.component.xquery.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xquery.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-saxon-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-saxon-sink.json
index fac2381..c7971c1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-saxon-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-saxon-sink.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.entityResolver": {
 			"name": "camel.sink.endpoint.entityResolver",
 			"description": "To use a custom org.xml.sax.EntityResolver with javax.xml.transform.sax.SAXSource.",
@@ -146,11 +139,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xslt-saxon.basicPropertyBinding": {
-			"name": "camel.component.xslt-saxon.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xslt-saxon.autowiredEnabled": {
+			"name": "camel.component.xslt-saxon.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xslt-saxon.saxonConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-sink.json
index b9bfd5c..b105bd9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-sink.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.entityResolver": {
 			"name": "camel.sink.endpoint.entityResolver",
 			"description": "To use a custom org.xml.sax.EntityResolver with javax.xml.transform.sax.SAXSource.",
@@ -127,11 +120,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xslt.basicPropertyBinding": {
-			"name": "camel.component.xslt.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xslt.autowiredEnabled": {
+			"name": "camel.component.xslt.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xslt.transformerFactoryClass": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-sink.json
index a1b32e8..2d52ef5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-sink.json
@@ -29,13 +29,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.requestor": {
 			"name": "camel.sink.endpoint.requestor",
 			"description": "To use a specific requester to communicate with Yammer.",
@@ -81,11 +74,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.yammer.basicPropertyBinding": {
-			"name": "camel.component.yammer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.yammer.autowiredEnabled": {
+			"name": "camel.component.yammer.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.yammer.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-source.json
index 6753b0e..b12d866 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-source.json
@@ -94,13 +94,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.requestor": {
 			"name": "camel.source.endpoint.requestor",
 			"description": "To use a specific requester to communicate with Yammer.",
@@ -272,11 +265,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.yammer.basicPropertyBinding": {
-			"name": "camel.component.yammer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.yammer.autowiredEnabled": {
+			"name": "camel.component.yammer.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.yammer.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-sink.json
index 285847d..61005a4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -85,11 +78,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.zendesk.basicPropertyBinding": {
-			"name": "camel.component.zendesk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.zendesk.autowiredEnabled": {
+			"name": "camel.component.zendesk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.zendesk.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-source.json
index fe37aad..e71b519 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-source.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -203,11 +196,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.zendesk.basicPropertyBinding": {
-			"name": "camel.component.zendesk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.zendesk.autowiredEnabled": {
+			"name": "camel.component.zendesk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.zendesk.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-master-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-master-source.json
index 835ea55..7335195 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-master-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-master-source.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -82,11 +75,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.zookeeper-master.basicPropertyBinding": {
-			"name": "camel.component.zookeeper-master.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.zookeeper-master.autowiredEnabled": {
+			"name": "camel.component.zookeeper-master.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.zookeeper-master.containerIdFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-sink.json
index 1632f32..5cbb69f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-sink.json
@@ -56,13 +56,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -105,11 +98,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.zookeeper.basicPropertyBinding": {
-			"name": "camel.component.zookeeper.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.zookeeper.autowiredEnabled": {
+			"name": "camel.component.zookeeper.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.zookeeper.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-source.json
index 4e8c18d..31288b8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-source.json
@@ -75,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -131,11 +124,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.zookeeper.basicPropertyBinding": {
-			"name": "camel.component.zookeeper.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.zookeeper.autowiredEnabled": {
+			"name": "camel.component.zookeeper.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.zookeeper.configuration": {
diff --git a/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-sink.json b/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-sink.json
index 16ae0b7..384a98f 100644
--- a/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-sink.json
+++ b/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-sink.json
@@ -261,13 +261,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.destinationResolver": {
 			"name": "camel.sink.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -760,11 +753,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.activemq.basicPropertyBinding": {
-			"name": "camel.component.activemq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.activemq.autowiredEnabled": {
+			"name": "camel.component.activemq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.activemq.configuration": {
diff --git a/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-source.json b/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-source.json
index 239fd28..b4688db 100644
--- a/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-source.json
+++ b/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-source.json
@@ -247,13 +247,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.destinationResolver": {
 			"name": "camel.source.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -734,11 +727,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.activemq.basicPropertyBinding": {
-			"name": "camel.component.activemq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.activemq.autowiredEnabled": {
+			"name": "camel.component.activemq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.activemq.configuration": {
diff --git a/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-sink-connector.adoc b/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-sink-connector.adoc
index 86fb62d..a10181e 100644
--- a/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-sink-connector.adoc
+++ b/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.activemq.CamelActivemqSinkConnec
 ----
 
 
-The camel-activemq sink connector supports 149 options, which are listed below.
+The camel-activemq sink connector supports 148 options, which are listed below.
 
 
 
@@ -67,7 +67,6 @@ The camel-activemq sink connector supports 149 options, which are listed below.
 | *camel.sink.endpoint.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.sink.endpoint.asyncStartListener* | Whether to startup the JmsConsumer 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/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is  [...]
 | *camel.sink.endpoint.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.sink.endpoint.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom erro [...]
 | *camel.sink.endpoint.exceptionListener* | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. | null | false | MEDIUM
@@ -142,7 +141,7 @@ The camel-activemq sink connector supports 149 options, which are listed below.
 | *camel.component.activemq.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.component.activemq.asyncStartListener* | Whether to startup the JmsConsumer 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/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this optio [...]
 | *camel.component.activemq.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.component.activemq.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.activemq.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.activemq.configuration* | To use a shared JMS configuration | null | false | MEDIUM
 | *camel.component.activemq.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.component.activemq.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom [...]
diff --git a/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-source-connector.adoc b/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-source-connector.adoc
index f814eca..431cccb 100644
--- a/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-source-connector.adoc
+++ b/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.activemq.CamelActivemqSourceConn
 ----
 
 
-The camel-activemq source connector supports 147 options, which are listed below.
+The camel-activemq source connector supports 146 options, which are listed below.
 
 
 
@@ -65,7 +65,6 @@ The camel-activemq source connector supports 147 options, which are listed below
 | *camel.source.endpoint.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.source.endpoint.asyncStartListener* | Whether to startup the JmsConsumer 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/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option i [...]
 | *camel.source.endpoint.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.source.endpoint.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom er [...]
 | *camel.source.endpoint.exceptionListener* | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. | null | false | MEDIUM
@@ -138,7 +137,7 @@ The camel-activemq source connector supports 147 options, which are listed below
 | *camel.component.activemq.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.component.activemq.asyncStartListener* | Whether to startup the JmsConsumer 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/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this optio [...]
 | *camel.component.activemq.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.component.activemq.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.activemq.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.activemq.configuration* | To use a shared JMS configuration | null | false | MEDIUM
 | *camel.component.activemq.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.component.activemq.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom [...]
diff --git a/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSinkConnectorConfig.java b/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSinkConnectorConfig.java
index 35c6d80..696dd6c 100644
--- a/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSinkConnectorConfig.java
+++ b/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSinkConnectorConfig.java
@@ -140,9 +140,6 @@ public class CamelActivemqSinkConnectorConfig
     public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_CONF = "camel.sink.endpoint.asyncStopListener";
     public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_CONF = "camel.sink.endpoint.destinationResolver";
     public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DOC = "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).";
     public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DEFAULT = null;
@@ -365,9 +362,9 @@ public class CamelActivemqSinkConnectorConfig
     public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_CONF = "camel.component.activemq.asyncStopListener";
     public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.activemq.basicPropertyBinding";
-    public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.activemq.autowiredEnabled";
+    public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_CONFIGURATION_CONF = "camel.component.activemq.configuration";
     public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_CONFIGURATION_DOC = "To use a shared JMS configuration";
     public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -524,7 +521,6 @@ public class CamelActivemqSinkConnectorConfig
         conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_EXCEPTION_LISTENER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ACTIVEMQ_ENDPOINT_EXCEPTION_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_EXCEPTION_LISTENER_DOC);
@@ -599,7 +595,7 @@ public class CamelActivemqSinkConnectorConfig
         conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_COMPONENT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ACTIVEMQ_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ACTIVEMQ_COMPONENT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ACTIVEMQ_COMPONENT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_ERROR_HANDLER_DOC);
diff --git a/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSourceConnectorConfig.java b/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSourceConnectorConfig.java
index d1422bc..8714894 100644
--- a/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSourceConnectorConfig.java
+++ b/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSourceConnectorConfig.java
@@ -134,9 +134,6 @@ public class CamelActivemqSourceConnectorConfig
     public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_CONF = "camel.source.endpoint.asyncStopListener";
     public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_CONF = "camel.source.endpoint.destinationResolver";
     public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DOC = "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).";
     public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DEFAULT = null;
@@ -353,9 +350,9 @@ public class CamelActivemqSourceConnectorConfig
     public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_CONF = "camel.component.activemq.asyncStopListener";
     public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.activemq.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.activemq.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_CONFIGURATION_CONF = "camel.component.activemq.configuration";
     public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_CONFIGURATION_DOC = "To use a shared JMS configuration";
     public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -516,7 +513,6 @@ public class CamelActivemqSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_EXCEPTION_LISTENER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_EXCEPTION_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_EXCEPTION_LISTENER_DOC);
@@ -589,7 +585,7 @@ public class CamelActivemqSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ERROR_HANDLER_DOC);
diff --git a/connectors/camel-ahc-kafka-connector/src/generated/resources/camel-ahc-sink.json b/connectors/camel-ahc-kafka-connector/src/generated/resources/camel-ahc-sink.json
index e895fc2..7390159 100644
--- a/connectors/camel-ahc-kafka-connector/src/generated/resources/camel-ahc-sink.json
+++ b/connectors/camel-ahc-kafka-connector/src/generated/resources/camel-ahc-sink.json
@@ -69,13 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -127,11 +120,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc.basicPropertyBinding": {
-			"name": "camel.component.ahc.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc.autowiredEnabled": {
+			"name": "camel.component.ahc.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc.binding": {
diff --git a/connectors/camel-ahc-kafka-connector/src/main/docs/camel-ahc-kafka-sink-connector.adoc b/connectors/camel-ahc-kafka-connector/src/main/docs/camel-ahc-kafka-sink-connector.adoc
index 02848cc..9c0c757 100644
--- a/connectors/camel-ahc-kafka-connector/src/main/docs/camel-ahc-kafka-sink-connector.adoc
+++ b/connectors/camel-ahc-kafka-connector/src/main/docs/camel-ahc-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.ahc.CamelAhcSinkConnector
 ----
 
 
-The camel-ahc sink connector supports 25 options, which are listed below.
+The camel-ahc sink connector supports 24 options, which are listed below.
 
 
 
@@ -38,7 +38,6 @@ The camel-ahc sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.throwExceptionOnFailure* | Option to disable throwing the AhcOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. | true | false | MEDIUM
 | *camel.sink.endpoint.transferException* | If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type (for example using Jetty or Servlet Camel components). On the producer side the exception will be deserialized and thrown as is, instead of the AhcOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConfigOptions* | To configure the AsyncHttpClientConfig using the key/values from the Map. | null | false | MEDIUM
@@ -47,7 +46,7 @@ The camel-ahc sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.sslContextParameters* | Reference to a org.apache.camel.support.jsse.SSLContextParameters in the Registry. This reference overrides any configured SSLContextParameters at the component level. See Using the JSSE Configuration Utility. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | null | false | MEDIUM
 | *camel.component.ahc.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.component.ahc.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.ahc.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.ahc.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.ahc.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.component.ahc.client* | To use a custom AsyncHttpClient | null | false | MEDIUM
 | *camel.component.ahc.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
diff --git a/connectors/camel-ahc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahc/CamelAhcSinkConnectorConfig.java b/connectors/camel-ahc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahc/CamelAhcSinkConnectorConfig.java
index ab6bdea..f765641 100644
--- a/connectors/camel-ahc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahc/CamelAhcSinkConnectorConfig.java
+++ b/connectors/camel-ahc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahc/CamelAhcSinkConnectorConfig.java
@@ -51,9 +51,6 @@ public class CamelAhcSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AHC_ENDPOINT_TRANSFER_EXCEPTION_CONF = "camel.sink.endpoint.transferException";
     public static final String CAMEL_SINK_AHC_ENDPOINT_TRANSFER_EXCEPTION_DOC = "If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type (for example using Jetty or Servlet Camel components). On the producer side the exception will be deserialized and thrown as is, instead of the AhcOperationFailedException. The caused exception is required to be serializ [...]
     public static final Boolean CAMEL_SINK_AHC_ENDPOINT_TRANSFER_EXCEPTION_DEFAULT = false;
-    public static final String CAMEL_SINK_AHC_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AHC_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AHC_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AHC_ENDPOINT_BINDING_CONF = "camel.sink.endpoint.binding";
     public static final String CAMEL_SINK_AHC_ENDPOINT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SINK_AHC_ENDPOINT_BINDING_DEFAULT = null;
@@ -78,9 +75,9 @@ public class CamelAhcSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AHC_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.ahc.allowJavaSerializedObject";
     public static final String CAMEL_SINK_AHC_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SINK_AHC_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SINK_AHC_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.ahc.basicPropertyBinding";
-    public static final String CAMEL_SINK_AHC_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AHC_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AHC_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.ahc.autowiredEnabled";
+    public static final String CAMEL_SINK_AHC_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AHC_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AHC_COMPONENT_BINDING_CONF = "camel.component.ahc.binding";
     public static final String CAMEL_SINK_AHC_COMPONENT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SINK_AHC_COMPONENT_BINDING_DEFAULT = null;
@@ -121,7 +118,6 @@ public class CamelAhcSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AHC_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AHC_ENDPOINT_THROW_EXCEPTION_ON_FAILURE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_ENDPOINT_THROW_EXCEPTION_ON_FAILURE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_THROW_EXCEPTION_ON_FAILURE_DOC);
         conf.define(CAMEL_SINK_AHC_ENDPOINT_TRANSFER_EXCEPTION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_ENDPOINT_TRANSFER_EXCEPTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_TRANSFER_EXCEPTION_DOC);
-        conf.define(CAMEL_SINK_AHC_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AHC_ENDPOINT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_ENDPOINT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_BINDING_DOC);
         conf.define(CAMEL_SINK_AHC_ENDPOINT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_ENDPOINT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_CLIENT_CONFIG_DOC);
         conf.define(CAMEL_SINK_AHC_ENDPOINT_CLIENT_CONFIG_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_ENDPOINT_CLIENT_CONFIG_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_CLIENT_CONFIG_OPTIONS_DOC);
@@ -130,7 +126,7 @@ public class CamelAhcSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AHC_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AHC_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AHC_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SINK_AHC_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AHC_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AHC_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AHC_COMPONENT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_COMPONENT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_COMPONENT_BINDING_DOC);
         conf.define(CAMEL_SINK_AHC_COMPONENT_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_COMPONENT_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_COMPONENT_CLIENT_DOC);
         conf.define(CAMEL_SINK_AHC_COMPONENT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_COMPONENT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_COMPONENT_CLIENT_CONFIG_DOC);
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-sink.json b/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-sink.json
index 34731ca..ef5573c 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-sink.json
+++ b/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-sink.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -134,11 +127,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-ws.basicPropertyBinding": {
-			"name": "camel.component.ahc-ws.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-ws.autowiredEnabled": {
+			"name": "camel.component.ahc-ws.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-ws.binding": {
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-source.json b/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-source.json
index 3ae9a95..b68bf77 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-source.json
+++ b/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-source.json
@@ -75,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -133,11 +126,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-ws.basicPropertyBinding": {
-			"name": "camel.component.ahc-ws.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-ws.autowiredEnabled": {
+			"name": "camel.component.ahc-ws.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-ws.binding": {
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-sink-connector.adoc b/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-sink-connector.adoc
index acc6523..cdfa57a 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-sink-connector.adoc
+++ b/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.ahcws.CamelAhcwsSinkConnector
 ----
 
 
-The camel-ahc-ws sink connector supports 26 options, which are listed below.
+The camel-ahc-ws sink connector supports 25 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-ahc-ws sink connector supports 26 options, which are listed below.
 | *camel.sink.endpoint.cookieHandler* | Configure a cookie handler to maintain a HTTP session | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.useStreaming* | To enable streaming to send data as multiple text fragments. | false | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConfigOptions* | To configure the AsyncHttpClientConfig using the key/values from the Map. | null | false | MEDIUM
@@ -48,7 +47,7 @@ The camel-ahc-ws sink connector supports 26 options, which are listed below.
 | *camel.sink.endpoint.sslContextParameters* | Reference to a org.apache.camel.support.jsse.SSLContextParameters in the Registry. This reference overrides any configured SSLContextParameters at the component level. See Using the JSSE Configuration Utility. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | null | false | MEDIUM
 | *camel.component.ahc-ws.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then  [...]
 | *camel.component.ahc-ws.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.ahc-ws.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.ahc-ws.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.ahc-ws.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.component.ahc-ws.client* | To use a custom AsyncHttpClient | null | false | MEDIUM
 | *camel.component.ahc-ws.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-source-connector.adoc b/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-source-connector.adoc
index 959ec97..8421cb8 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-source-connector.adoc
+++ b/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.ahcws.CamelAhcwsSourceConnector
 ----
 
 
-The camel-ahc-ws source connector supports 26 options, which are listed below.
+The camel-ahc-ws source connector supports 25 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-ahc-ws source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.sendMessageOnError* | Whether to send an message if the web-socket listener received an error. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.source.endpoint.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
 | *camel.source.endpoint.clientConfigOptions* | To configure the AsyncHttpClientConfig using the key/values from the Map. | null | false | MEDIUM
@@ -48,7 +47,7 @@ The camel-ahc-ws source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.sslContextParameters* | Reference to a org.apache.camel.support.jsse.SSLContextParameters in the Registry. This reference overrides any configured SSLContextParameters at the component level. See Using the JSSE Configuration Utility. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | null | false | MEDIUM
 | *camel.component.ahc-ws.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.component.ahc-ws.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.ahc-ws.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.ahc-ws.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.ahc-ws.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.component.ahc-ws.client* | To use a custom AsyncHttpClient | null | false | MEDIUM
 | *camel.component.ahc-ws.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSinkConnectorConfig.java b/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSinkConnectorConfig.java
index a293964..f939e0a 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSinkConnectorConfig.java
+++ b/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSinkConnectorConfig.java
@@ -54,9 +54,6 @@ public class CamelAhcwsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AHCWS_ENDPOINT_USE_STREAMING_CONF = "camel.sink.endpoint.useStreaming";
     public static final String CAMEL_SINK_AHCWS_ENDPOINT_USE_STREAMING_DOC = "To enable streaming to send data as multiple text fragments.";
     public static final Boolean CAMEL_SINK_AHCWS_ENDPOINT_USE_STREAMING_DEFAULT = false;
-    public static final String CAMEL_SINK_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AHCWS_ENDPOINT_BINDING_CONF = "camel.sink.endpoint.binding";
     public static final String CAMEL_SINK_AHCWS_ENDPOINT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SINK_AHCWS_ENDPOINT_BINDING_DEFAULT = null;
@@ -81,9 +78,9 @@ public class CamelAhcwsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.ahc-ws.allowJavaSerializedObject";
     public static final String CAMEL_SINK_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SINK_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SINK_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.ahc-ws.basicPropertyBinding";
-    public static final String CAMEL_SINK_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AHCWS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.ahc-ws.autowiredEnabled";
+    public static final String CAMEL_SINK_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AHCWS_COMPONENT_BINDING_CONF = "camel.component.ahc-ws.binding";
     public static final String CAMEL_SINK_AHCWS_COMPONENT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SINK_AHCWS_COMPONENT_BINDING_DEFAULT = null;
@@ -125,7 +122,6 @@ public class CamelAhcwsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_COOKIE_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_ENDPOINT_COOKIE_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_COOKIE_HANDLER_DOC);
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_USE_STREAMING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_ENDPOINT_USE_STREAMING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_USE_STREAMING_DOC);
-        conf.define(CAMEL_SINK_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_ENDPOINT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_BINDING_DOC);
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_ENDPOINT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_CLIENT_CONFIG_DOC);
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_CLIENT_CONFIG_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DOC);
@@ -134,7 +130,7 @@ public class CamelAhcwsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AHCWS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SINK_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AHCWS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AHCWS_COMPONENT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_COMPONENT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_COMPONENT_BINDING_DOC);
         conf.define(CAMEL_SINK_AHCWS_COMPONENT_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_COMPONENT_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_COMPONENT_CLIENT_DOC);
         conf.define(CAMEL_SINK_AHCWS_COMPONENT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_COMPONENT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_COMPONENT_CLIENT_CONFIG_DOC);
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSourceConnectorConfig.java b/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSourceConnectorConfig.java
index a69899e..c99fb67 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSourceConnectorConfig.java
+++ b/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSourceConnectorConfig.java
@@ -56,9 +56,6 @@ public class CamelAhcwsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_BINDING_CONF = "camel.source.endpoint.binding";
     public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_BINDING_DEFAULT = null;
@@ -83,9 +80,9 @@ public class CamelAhcwsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.ahc-ws.allowJavaSerializedObject";
     public static final String CAMEL_SOURCE_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SOURCE_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.ahc-ws.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AHCWS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.ahc-ws.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AHCWS_COMPONENT_BINDING_CONF = "camel.component.ahc-ws.binding";
     public static final String CAMEL_SOURCE_AHCWS_COMPONENT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SOURCE_AHCWS_COMPONENT_BINDING_DEFAULT = null;
@@ -127,7 +124,6 @@ public class CamelAhcwsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_SEND_MESSAGE_ON_ERROR_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWS_ENDPOINT_SEND_MESSAGE_ON_ERROR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_SEND_MESSAGE_ON_ERROR_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_ENDPOINT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_ENDPOINT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_CLIENT_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_CLIENT_CONFIG_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DOC);
@@ -136,7 +132,7 @@ public class CamelAhcwsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_COMPONENT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_COMPONENT_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_COMPONENT_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_COMPONENT_CLIENT_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_COMPONENT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_COMPONENT_CLIENT_CONFIG_DOC);
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-sink.json b/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-sink.json
index 63cbb60..e4fea62 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-sink.json
+++ b/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-sink.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -134,11 +127,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-wss.basicPropertyBinding": {
-			"name": "camel.component.ahc-wss.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-wss.autowiredEnabled": {
+			"name": "camel.component.ahc-wss.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-wss.binding": {
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-source.json b/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-source.json
index 40c1d8a..270adac 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-source.json
+++ b/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-source.json
@@ -75,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -133,11 +126,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-wss.basicPropertyBinding": {
-			"name": "camel.component.ahc-wss.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-wss.autowiredEnabled": {
+			"name": "camel.component.ahc-wss.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-wss.binding": {
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-sink-connector.adoc b/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-sink-connector.adoc
index d8f0ec2..665ec64 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-sink-connector.adoc
+++ b/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.ahcwss.CamelAhcwssSinkConnector
 ----
 
 
-The camel-ahc-wss sink connector supports 26 options, which are listed below.
+The camel-ahc-wss sink connector supports 25 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-ahc-wss sink connector supports 26 options, which are listed below.
 | *camel.sink.endpoint.cookieHandler* | Configure a cookie handler to maintain a HTTP session | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.useStreaming* | To enable streaming to send data as multiple text fragments. | false | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConfigOptions* | To configure the AsyncHttpClientConfig using the key/values from the Map. | null | false | MEDIUM
@@ -48,7 +47,7 @@ The camel-ahc-wss sink connector supports 26 options, which are listed below.
 | *camel.sink.endpoint.sslContextParameters* | Reference to a org.apache.camel.support.jsse.SSLContextParameters in the Registry. This reference overrides any configured SSLContextParameters at the component level. See Using the JSSE Configuration Utility. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | null | false | MEDIUM
 | *camel.component.ahc-wss.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...]
 | *camel.component.ahc-wss.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.ahc-wss.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.ahc-wss.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.ahc-wss.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.component.ahc-wss.client* | To use a custom AsyncHttpClient | null | false | MEDIUM
 | *camel.component.ahc-wss.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-source-connector.adoc b/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-source-connector.adoc
index 34d52b5..47fb885 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-source-connector.adoc
+++ b/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.ahcwss.CamelAhcwssSourceConnecto
 ----
 
 
-The camel-ahc-wss source connector supports 26 options, which are listed below.
+The camel-ahc-wss source connector supports 25 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-ahc-wss source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.sendMessageOnError* | Whether to send an message if the web-socket listener received an error. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.source.endpoint.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
 | *camel.source.endpoint.clientConfigOptions* | To configure the AsyncHttpClientConfig using the key/values from the Map. | null | false | MEDIUM
@@ -48,7 +47,7 @@ The camel-ahc-wss source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.sslContextParameters* | Reference to a org.apache.camel.support.jsse.SSLContextParameters in the Registry. This reference overrides any configured SSLContextParameters at the component level. See Using the JSSE Configuration Utility. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | null | false | MEDIUM
 | *camel.component.ahc-wss.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.component.ahc-wss.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.ahc-wss.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.ahc-wss.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.ahc-wss.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.component.ahc-wss.client* | To use a custom AsyncHttpClient | null | false | MEDIUM
 | *camel.component.ahc-wss.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSinkConnectorConfig.java b/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSinkConnectorConfig.java
index 54d7982..f934128 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSinkConnectorConfig.java
+++ b/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSinkConnectorConfig.java
@@ -54,9 +54,6 @@ public class CamelAhcwssSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AHCWSS_ENDPOINT_USE_STREAMING_CONF = "camel.sink.endpoint.useStreaming";
     public static final String CAMEL_SINK_AHCWSS_ENDPOINT_USE_STREAMING_DOC = "To enable streaming to send data as multiple text fragments.";
     public static final Boolean CAMEL_SINK_AHCWSS_ENDPOINT_USE_STREAMING_DEFAULT = false;
-    public static final String CAMEL_SINK_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AHCWSS_ENDPOINT_BINDING_CONF = "camel.sink.endpoint.binding";
     public static final String CAMEL_SINK_AHCWSS_ENDPOINT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SINK_AHCWSS_ENDPOINT_BINDING_DEFAULT = null;
@@ -81,9 +78,9 @@ public class CamelAhcwssSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.ahc-wss.allowJavaSerializedObject";
     public static final String CAMEL_SINK_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SINK_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SINK_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.ahc-wss.basicPropertyBinding";
-    public static final String CAMEL_SINK_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.ahc-wss.autowiredEnabled";
+    public static final String CAMEL_SINK_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AHCWSS_COMPONENT_BINDING_CONF = "camel.component.ahc-wss.binding";
     public static final String CAMEL_SINK_AHCWSS_COMPONENT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SINK_AHCWSS_COMPONENT_BINDING_DEFAULT = null;
@@ -125,7 +122,6 @@ public class CamelAhcwssSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_COOKIE_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_ENDPOINT_COOKIE_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_COOKIE_HANDLER_DOC);
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_USE_STREAMING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_ENDPOINT_USE_STREAMING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_USE_STREAMING_DOC);
-        conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_ENDPOINT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_BINDING_DOC);
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_ENDPOINT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_CLIENT_CONFIG_DOC);
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_CLIENT_CONFIG_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DOC);
@@ -134,7 +130,7 @@ public class CamelAhcwssSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AHCWSS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SINK_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AHCWSS_COMPONENT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_COMPONENT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_COMPONENT_BINDING_DOC);
         conf.define(CAMEL_SINK_AHCWSS_COMPONENT_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_COMPONENT_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_COMPONENT_CLIENT_DOC);
         conf.define(CAMEL_SINK_AHCWSS_COMPONENT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_COMPONENT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_COMPONENT_CLIENT_CONFIG_DOC);
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSourceConnectorConfig.java b/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSourceConnectorConfig.java
index a6dc34b..6d3971c 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSourceConnectorConfig.java
+++ b/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSourceConnectorConfig.java
@@ -56,9 +56,6 @@ public class CamelAhcwssSourceConnectorConfig
     public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_BINDING_CONF = "camel.source.endpoint.binding";
     public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_BINDING_DEFAULT = null;
@@ -83,9 +80,9 @@ public class CamelAhcwssSourceConnectorConfig
     public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.ahc-wss.allowJavaSerializedObject";
     public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SOURCE_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.ahc-wss.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.ahc-wss.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_BINDING_CONF = "camel.component.ahc-wss.binding";
     public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_BINDING_DEFAULT = null;
@@ -127,7 +124,6 @@ public class CamelAhcwssSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_SEND_MESSAGE_ON_ERROR_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWSS_ENDPOINT_SEND_MESSAGE_ON_ERROR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_SEND_MESSAGE_ON_ERROR_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_ENDPOINT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_ENDPOINT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_CLIENT_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_CLIENT_CONFIG_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DOC);
@@ -136,7 +132,7 @@ public class CamelAhcwssSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWSS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_COMPONENT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_COMPONENT_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_COMPONENT_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_COMPONENT_CLIENT_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_COMPONENT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_COMPONENT_CLIENT_CONFIG_DOC);
diff --git a/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-sink.json b/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-sink.json
index d49cf73..a72d743 100644
--- a/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-sink.json
+++ b/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-sink.json
@@ -261,13 +261,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.destinationResolver": {
 			"name": "camel.sink.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -747,11 +740,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.amqp.basicPropertyBinding": {
-			"name": "camel.component.amqp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.amqp.autowiredEnabled": {
+			"name": "camel.component.amqp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.amqp.configuration": {
diff --git a/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-source.json b/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-source.json
index cc16650..c3feb3a 100644
--- a/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-source.json
+++ b/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-source.json
@@ -247,13 +247,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.destinationResolver": {
 			"name": "camel.source.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -721,11 +714,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.amqp.basicPropertyBinding": {
-			"name": "camel.component.amqp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.amqp.autowiredEnabled": {
+			"name": "camel.component.amqp.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.amqp.configuration": {
diff --git a/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-sink-connector.adoc b/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-sink-connector.adoc
index 69ff088..a54fe3d 100644
--- a/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-sink-connector.adoc
+++ b/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.amqp.CamelAmqpSinkConnector
 ----
 
 
-The camel-amqp sink connector supports 146 options, which are listed below.
+The camel-amqp sink connector supports 145 options, which are listed below.
 
 
 
@@ -67,7 +67,6 @@ The camel-amqp sink connector supports 146 options, which are listed below.
 | *camel.sink.endpoint.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.sink.endpoint.asyncStartListener* | Whether to startup the JmsConsumer 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/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is  [...]
 | *camel.sink.endpoint.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.sink.endpoint.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom erro [...]
 | *camel.sink.endpoint.exceptionListener* | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. | null | false | MEDIUM
@@ -140,7 +139,7 @@ The camel-amqp sink connector supports 146 options, which are listed below.
 | *camel.component.amqp.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.component.amqp.asyncStartListener* | Whether to startup the JmsConsumer 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/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is [...]
 | *camel.component.amqp.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.component.amqp.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.amqp.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.amqp.configuration* | To use a shared JMS configuration | null | false | MEDIUM
 | *camel.component.amqp.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.component.amqp.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom err [...]
diff --git a/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-source-connector.adoc b/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-source-connector.adoc
index c672f9e..1aab7b8 100644
--- a/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-source-connector.adoc
+++ b/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.amqp.CamelAmqpSourceConnector
 ----
 
 
-The camel-amqp source connector supports 144 options, which are listed below.
+The camel-amqp source connector supports 143 options, which are listed below.
 
 
 
@@ -65,7 +65,6 @@ The camel-amqp source connector supports 144 options, which are listed below.
 | *camel.source.endpoint.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.source.endpoint.asyncStartListener* | Whether to startup the JmsConsumer 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/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option i [...]
 | *camel.source.endpoint.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.source.endpoint.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom er [...]
 | *camel.source.endpoint.exceptionListener* | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. | null | false | MEDIUM
@@ -136,7 +135,7 @@ The camel-amqp source connector supports 144 options, which are listed below.
 | *camel.component.amqp.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.component.amqp.asyncStartListener* | Whether to startup the JmsConsumer 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/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is [...]
 | *camel.component.amqp.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.component.amqp.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.amqp.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.amqp.configuration* | To use a shared JMS configuration | null | false | MEDIUM
 | *camel.component.amqp.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.component.amqp.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom err [...]
diff --git a/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSinkConnectorConfig.java b/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSinkConnectorConfig.java
index f8892ef..e0056e0 100644
--- a/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSinkConnectorConfig.java
+++ b/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSinkConnectorConfig.java
@@ -138,9 +138,6 @@ public class CamelAmqpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_CONF = "camel.sink.endpoint.asyncStopListener";
     public static final String CAMEL_SINK_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SINK_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SINK_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AMQP_ENDPOINT_DESTINATION_RESOLVER_CONF = "camel.sink.endpoint.destinationResolver";
     public static final String CAMEL_SINK_AMQP_ENDPOINT_DESTINATION_RESOLVER_DOC = "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).";
     public static final String CAMEL_SINK_AMQP_ENDPOINT_DESTINATION_RESOLVER_DEFAULT = null;
@@ -357,9 +354,9 @@ public class CamelAmqpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AMQP_COMPONENT_ASYNC_STOP_LISTENER_CONF = "camel.component.amqp.asyncStopListener";
     public static final String CAMEL_SINK_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SINK_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SINK_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.amqp.basicPropertyBinding";
-    public static final String CAMEL_SINK_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AMQP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.amqp.autowiredEnabled";
+    public static final String CAMEL_SINK_AMQP_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AMQP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AMQP_COMPONENT_CONFIGURATION_CONF = "camel.component.amqp.configuration";
     public static final String CAMEL_SINK_AMQP_COMPONENT_CONFIGURATION_DOC = "To use a shared JMS configuration";
     public static final String CAMEL_SINK_AMQP_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -513,7 +510,6 @@ public class CamelAmqpSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AMQP_ENDPOINT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SINK_AMQP_ENDPOINT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_ENDPOINT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SINK_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SINK_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AMQP_ENDPOINT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AMQP_ENDPOINT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SINK_AMQP_ENDPOINT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AMQP_ENDPOINT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SINK_AMQP_ENDPOINT_EXCEPTION_LISTENER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AMQP_ENDPOINT_EXCEPTION_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_EXCEPTION_LISTENER_DOC);
@@ -586,7 +582,7 @@ public class CamelAmqpSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AMQP_COMPONENT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_COMPONENT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SINK_AMQP_COMPONENT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_COMPONENT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SINK_AMQP_COMPONENT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SINK_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AMQP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AMQP_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AMQP_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AMQP_COMPONENT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AMQP_COMPONENT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SINK_AMQP_COMPONENT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AMQP_COMPONENT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_ERROR_HANDLER_DOC);
diff --git a/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSourceConnectorConfig.java b/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSourceConnectorConfig.java
index 1765cba..0e39f97 100644
--- a/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSourceConnectorConfig.java
+++ b/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSourceConnectorConfig.java
@@ -134,9 +134,6 @@ public class CamelAmqpSourceConnectorConfig
     public static final String CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_CONF = "camel.source.endpoint.asyncStopListener";
     public static final String CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AMQP_ENDPOINT_DESTINATION_RESOLVER_CONF = "camel.source.endpoint.destinationResolver";
     public static final String CAMEL_SOURCE_AMQP_ENDPOINT_DESTINATION_RESOLVER_DOC = "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).";
     public static final String CAMEL_SOURCE_AMQP_ENDPOINT_DESTINATION_RESOLVER_DEFAULT = null;
@@ -347,9 +344,9 @@ public class CamelAmqpSourceConnectorConfig
     public static final String CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_STOP_LISTENER_CONF = "camel.component.amqp.asyncStopListener";
     public static final String CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.amqp.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AMQP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.amqp.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AMQP_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AMQP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AMQP_COMPONENT_CONFIGURATION_CONF = "camel.component.amqp.configuration";
     public static final String CAMEL_SOURCE_AMQP_COMPONENT_CONFIGURATION_DOC = "To use a shared JMS configuration";
     public static final String CAMEL_SOURCE_AMQP_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -507,7 +504,6 @@ public class CamelAmqpSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AMQP_ENDPOINT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AMQP_ENDPOINT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_EXCEPTION_LISTENER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AMQP_ENDPOINT_EXCEPTION_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_EXCEPTION_LISTENER_DOC);
@@ -578,7 +574,7 @@ public class CamelAmqpSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AMQP_COMPONENT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_COMPONENT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SOURCE_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AMQP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AMQP_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AMQP_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SOURCE_AMQP_COMPONENT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AMQP_COMPONENT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SOURCE_AMQP_COMPONENT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AMQP_COMPONENT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_ERROR_HANDLER_DOC);
diff --git a/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-sink.json b/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-sink.json
index 2ebea02..ec84d66 100644
--- a/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-sink.json
+++ b/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -55,11 +48,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.apns.basicPropertyBinding": {
-			"name": "camel.component.apns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.apns.autowiredEnabled": {
+			"name": "camel.component.apns.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-source.json b/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-source.json
index 8e59414..d8e7156 100644
--- a/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-source.json
+++ b/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-source.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -173,11 +166,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.apns.basicPropertyBinding": {
-			"name": "camel.component.apns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.apns.autowiredEnabled": {
+			"name": "camel.component.apns.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-sink-connector.adoc b/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-sink-connector.adoc
index 38a3d80..727bc82 100644
--- a/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-sink-connector.adoc
+++ b/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.apns.CamelApnsSinkConnector
 ----
 
 
-The camel-apns sink connector supports 8 options, which are listed below.
+The camel-apns sink connector supports 7 options, which are listed below.
 
 
 
@@ -32,11 +32,10 @@ The camel-apns sink connector supports 8 options, which are listed below.
 | *camel.sink.path.name* | Name of the endpoint | null | false | MEDIUM
 | *camel.sink.endpoint.tokens* | Configure this property in case you want to statically declare tokens related to devices you want to notify. Tokens are separated by comma. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.apns.apnsService* | The ApnsService to use. The org.apache.camel.component.apns.factory.ApnsServiceFactory can be used to build a ApnsService | null | true | HIGH
 | *camel.component.apns.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cr [...]
-| *camel.component.apns.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.apns.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-source-connector.adoc b/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-source-connector.adoc
index 22f14fa..6541637 100644
--- a/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-source-connector.adoc
+++ b/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.apns.CamelApnsSourceConnector
 ----
 
 
-The camel-apns source connector supports 26 options, which are listed below.
+The camel-apns source connector supports 25 options, which are listed below.
 
 
 
@@ -36,7 +36,6 @@ The camel-apns source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.backoffErrorThreshold* | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
 | *camel.source.endpoint.backoffIdleThreshold* | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
@@ -54,7 +53,7 @@ The camel-apns source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.useFixedDelay* | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | false | MEDIUM
 | *camel.component.apns.apnsService* | The ApnsService to use. The org.apache.camel.component.apns.factory.ApnsServiceFactory can be used to build a ApnsService | null | true | HIGH
 | *camel.component.apns.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.apns.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.apns.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSinkConnectorConfig.java b/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSinkConnectorConfig.java
index d91709c..99341d4 100644
--- a/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSinkConnectorConfig.java
+++ b/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSinkConnectorConfig.java
@@ -33,9 +33,6 @@ public class CamelApnsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_APNS_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_APNS_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when  [...]
     public static final Boolean CAMEL_SINK_APNS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_APNS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_APNS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_APNS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -45,9 +42,9 @@ public class CamelApnsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_APNS_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.apns.lazyStartProducer";
     public static final String CAMEL_SINK_APNS_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when [...]
     public static final Boolean CAMEL_SINK_APNS_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_APNS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.apns.basicPropertyBinding";
-    public static final String CAMEL_SINK_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_APNS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.apns.autowiredEnabled";
+    public static final String CAMEL_SINK_APNS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_APNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelApnsSinkConnectorConfig(
             ConfigDef config,
@@ -64,11 +61,10 @@ public class CamelApnsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_APNS_PATH_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_APNS_PATH_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_PATH_NAME_DOC);
         conf.define(CAMEL_SINK_APNS_ENDPOINT_TOKENS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_APNS_ENDPOINT_TOKENS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_ENDPOINT_TOKENS_DOC);
         conf.define(CAMEL_SINK_APNS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_APNS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_APNS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_APNS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_APNS_COMPONENT_APNS_SERVICE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_APNS_COMPONENT_APNS_SERVICE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_APNS_COMPONENT_APNS_SERVICE_DOC);
         conf.define(CAMEL_SINK_APNS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_APNS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_APNS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_APNS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_APNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSourceConnectorConfig.java b/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSourceConnectorConfig.java
index 8cb77ca..622e55c 100644
--- a/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSourceConnectorConfig.java
+++ b/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSourceConnectorConfig.java
@@ -47,9 +47,6 @@ public class CamelApnsSourceConnectorConfig
     public static final String CAMEL_SOURCE_APNS_ENDPOINT_POLL_STRATEGY_CONF = "camel.source.endpoint.pollStrategy";
     public static final String CAMEL_SOURCE_APNS_ENDPOINT_POLL_STRATEGY_DOC = "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.";
     public static final String CAMEL_SOURCE_APNS_ENDPOINT_POLL_STRATEGY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_APNS_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_APNS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_APNS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -101,9 +98,9 @@ public class CamelApnsSourceConnectorConfig
     public static final String CAMEL_SOURCE_APNS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.apns.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_APNS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_APNS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_APNS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.apns.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_APNS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.apns.autowiredEnabled";
+    public static final String CAMEL_SOURCE_APNS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_APNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelApnsSourceConnectorConfig(
             ConfigDef config,
@@ -124,7 +121,6 @@ public class CamelApnsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_APNS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_APNS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_APNS_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_POLL_STRATEGY_DOC);
-        conf.define(CAMEL_SOURCE_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_APNS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_APNS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC);
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_APNS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC);
@@ -142,7 +138,7 @@ public class CamelApnsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_USE_FIXED_DELAY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_APNS_ENDPOINT_USE_FIXED_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_USE_FIXED_DELAY_DOC);
         conf.define(CAMEL_SOURCE_APNS_COMPONENT_APNS_SERVICE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_APNS_COMPONENT_APNS_SERVICE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_APNS_COMPONENT_APNS_SERVICE_DOC);
         conf.define(CAMEL_SOURCE_APNS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_APNS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_APNS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_APNS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_APNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-arangodb-kafka-connector/src/generated/resources/camel-arangodb-sink.json b/connectors/camel-arangodb-kafka-connector/src/generated/resources/camel-arangodb-sink.json
index 08f33d9..8d71970 100644
--- a/connectors/camel-arangodb-kafka-connector/src/generated/resources/camel-arangodb-sink.json
+++ b/connectors/camel-arangodb-kafka-connector/src/generated/resources/camel-arangodb-sink.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -145,11 +138,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.arangodb.basicPropertyBinding": {
-			"name": "camel.component.arangodb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.arangodb.autowiredEnabled": {
+			"name": "camel.component.arangodb.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.arangodb.password": {
diff --git a/connectors/camel-arangodb-kafka-connector/src/main/docs/camel-arangodb-kafka-sink-connector.adoc b/connectors/camel-arangodb-kafka-connector/src/main/docs/camel-arangodb-kafka-sink-connector.adoc
index 291a26e..ced1edc 100644
--- a/connectors/camel-arangodb-kafka-connector/src/main/docs/camel-arangodb-kafka-sink-connector.adoc
+++ b/connectors/camel-arangodb-kafka-connector/src/main/docs/camel-arangodb-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.arangodb.CamelArangodbSinkConnec
 ----
 
 
-The camel-arangodb sink connector supports 25 options, which are listed below.
+The camel-arangodb sink connector supports 24 options, which are listed below.
 
 
 
@@ -38,7 +38,6 @@ The camel-arangodb sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.operation* | Operations to perform on ArangoDb. For the operation AQL_QUERY, no need to specify a collection or graph. One of: [SAVE_DOCUMENT] [FIND_DOCUMENT_BY_KEY] [UPDATE_DOCUMENT] [DELETE_DOCUMENT] [AQL_QUERY] [SAVE_VERTEX] [FIND_VERTEX_BY_KEY] [UPDATE_VERTEX] [DELETE_VERTEX] [SAVE_EDGE] [FIND_EDGE_BY_KEY] [UPDATE_EDGE] [DELETE_EDGE] | null | false | MEDIUM
 | *camel.sink.endpoint.port* | ArangoDB exposed port. If host and port are default, this field is Optional. | null | false | MEDIUM
 | *camel.sink.endpoint.vertexCollection* | Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operation on vertices using these operations : SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE. The graph attribute is mandatory. | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.password* | ArangoDB password. If user and password are default, this field is Optional. | null | false | MEDIUM
 | *camel.sink.endpoint.user* | ArangoDB user. If user and password are default, this field is Optional. | null | false | MEDIUM
@@ -51,7 +50,7 @@ The camel-arangodb sink connector supports 25 options, which are listed below.
 | *camel.component.arangodb.operation* | Operations to perform on ArangoDb. For the operation AQL_QUERY, no need to specify a collection or graph. One of: [SAVE_DOCUMENT] [FIND_DOCUMENT_BY_KEY] [UPDATE_DOCUMENT] [DELETE_DOCUMENT] [AQL_QUERY] [SAVE_VERTEX] [FIND_VERTEX_BY_KEY] [UPDATE_VERTEX] [DELETE_VERTEX] [SAVE_EDGE] [FIND_EDGE_BY_KEY] [UPDATE_EDGE] [DELETE_EDGE] | null | false | MEDIUM
 | *camel.component.arangodb.port* | ArangoDB exposed port. If host and port are default, this field is Optional. | null | false | MEDIUM
 | *camel.component.arangodb.vertexCollection* | Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operation on vertices using these operations : SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE. The graph attribute is mandatory. | null | false | MEDIUM
-| *camel.component.arangodb.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.arangodb.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.arangodb.password* | ArangoDB password. If user and password are default, this field is Optional. | null | false | MEDIUM
 | *camel.component.arangodb.user* | ArangoDB user. If user and password are default, this field is Optional. | null | false | MEDIUM
 |===
diff --git a/connectors/camel-arangodb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/arangodb/CamelArangodbSinkConnectorConfig.java b/connectors/camel-arangodb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/arangodb/CamelArangodbSinkConnectorConfig.java
index 574c832..475ea8b 100644
--- a/connectors/camel-arangodb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/arangodb/CamelArangodbSinkConnectorConfig.java
+++ b/connectors/camel-arangodb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/arangodb/CamelArangodbSinkConnectorConfig.java
@@ -53,9 +53,6 @@ public class CamelArangodbSinkConnectorConfig
     public static final String CAMEL_SINK_ARANGODB_ENDPOINT_VERTEX_COLLECTION_CONF = "camel.sink.endpoint.vertexCollection";
     public static final String CAMEL_SINK_ARANGODB_ENDPOINT_VERTEX_COLLECTION_DOC = "Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operation on vertices using these operations : SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE. The graph attribute is mandatory.";
     public static final String CAMEL_SINK_ARANGODB_ENDPOINT_VERTEX_COLLECTION_DEFAULT = null;
-    public static final String CAMEL_SINK_ARANGODB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ARANGODB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ARANGODB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ARANGODB_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_ARANGODB_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_ARANGODB_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -92,9 +89,9 @@ public class CamelArangodbSinkConnectorConfig
     public static final String CAMEL_SINK_ARANGODB_COMPONENT_VERTEX_COLLECTION_CONF = "camel.component.arangodb.vertexCollection";
     public static final String CAMEL_SINK_ARANGODB_COMPONENT_VERTEX_COLLECTION_DOC = "Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operation on vertices using these operations : SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE. The graph attribute is mandatory.";
     public static final String CAMEL_SINK_ARANGODB_COMPONENT_VERTEX_COLLECTION_DEFAULT = null;
-    public static final String CAMEL_SINK_ARANGODB_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.arangodb.basicPropertyBinding";
-    public static final String CAMEL_SINK_ARANGODB_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ARANGODB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ARANGODB_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.arangodb.autowiredEnabled";
+    public static final String CAMEL_SINK_ARANGODB_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ARANGODB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ARANGODB_COMPONENT_PASSWORD_CONF = "camel.component.arangodb.password";
     public static final String CAMEL_SINK_ARANGODB_COMPONENT_PASSWORD_DOC = "ArangoDB password. If user and password are default, this field is Optional.";
     public static final String CAMEL_SINK_ARANGODB_COMPONENT_PASSWORD_DEFAULT = null;
@@ -123,7 +120,6 @@ public class CamelArangodbSinkConnectorConfig
         conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_OPERATION_DOC);
         conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_PORT_CONF, ConfigDef.Type.INT, CAMEL_SINK_ARANGODB_ENDPOINT_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_PORT_DOC);
         conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_VERTEX_COLLECTION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_ENDPOINT_VERTEX_COLLECTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_VERTEX_COLLECTION_DOC);
-        conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ARANGODB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ARANGODB_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_PASSWORD_DOC);
         conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_USER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_ENDPOINT_USER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_USER_DOC);
@@ -136,7 +132,7 @@ public class CamelArangodbSinkConnectorConfig
         conf.define(CAMEL_SINK_ARANGODB_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_COMPONENT_OPERATION_DOC);
         conf.define(CAMEL_SINK_ARANGODB_COMPONENT_PORT_CONF, ConfigDef.Type.INT, CAMEL_SINK_ARANGODB_COMPONENT_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_COMPONENT_PORT_DOC);
         conf.define(CAMEL_SINK_ARANGODB_COMPONENT_VERTEX_COLLECTION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_COMPONENT_VERTEX_COLLECTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_COMPONENT_VERTEX_COLLECTION_DOC);
-        conf.define(CAMEL_SINK_ARANGODB_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ARANGODB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ARANGODB_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ARANGODB_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ARANGODB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ARANGODB_COMPONENT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_COMPONENT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_COMPONENT_PASSWORD_DOC);
         conf.define(CAMEL_SINK_ARANGODB_COMPONENT_USER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_COMPONENT_USER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_COMPONENT_USER_DOC);
         return conf;
diff --git a/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-sink.json b/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-sink.json
index 52cc0ca..506fbff 100644
--- a/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-sink.json
+++ b/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-sink.json
@@ -196,13 +196,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -217,11 +210,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.as2.basicPropertyBinding": {
-			"name": "camel.component.as2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.as2.autowiredEnabled": {
+			"name": "camel.component.as2.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.as2.configuration": {
diff --git a/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-source.json b/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-source.json
index 5097d1e..207f25c 100644
--- a/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-source.json
+++ b/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-source.json
@@ -201,13 +201,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -222,11 +215,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.as2.basicPropertyBinding": {
-			"name": "camel.component.as2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.as2.autowiredEnabled": {
+			"name": "camel.component.as2.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.as2.configuration": {
diff --git a/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-sink-connector.adoc b/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-sink-connector.adoc
index be8bfda..3b8b1a6 100644
--- a/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-sink-connector.adoc
+++ b/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.as2.CamelAs2SinkConnector
 ----
 
 
-The camel-as2 sink connector supports 35 options, which are listed below.
+The camel-as2 sink connector supports 34 options, which are listed below.
 
 
 
@@ -59,10 +59,9 @@ The camel-as2 sink connector supports 35 options, which are listed below.
 | *camel.sink.endpoint.targetPortNumber* | The port number of target host. -1 indicates the scheme default port. | null | false | MEDIUM
 | *camel.sink.endpoint.userAgent* | The value included in the User-Agent message header identifying the AS2 user agent. | "Camel AS2 Client Endpoint" | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.as2.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.component.as2.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.as2.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.as2.configuration* | Component configuration | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-source-connector.adoc b/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-source-connector.adoc
index 3da5b3e..e53428f 100644
--- a/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-source-connector.adoc
+++ b/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.as2.CamelAs2SourceConnector
 ----
 
 
-The camel-as2 source connector supports 36 options, which are listed below.
+The camel-as2 source connector supports 35 options, which are listed below.
 
 
 
@@ -60,10 +60,9 @@ The camel-as2 source connector supports 36 options, which are listed below.
 | *camel.source.endpoint.userAgent* | The value included in the User-Agent message header identifying the AS2 user agent. | "Camel AS2 Client Endpoint" | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.as2.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.as2.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.as2.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.as2.configuration* | Component configuration | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SinkConnectorConfig.java b/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SinkConnectorConfig.java
index 0092a16..3649103 100644
--- a/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SinkConnectorConfig.java
+++ b/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SinkConnectorConfig.java
@@ -114,18 +114,15 @@ public class CamelAs2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AS2_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_AS2_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when t [...]
     public static final Boolean CAMEL_SINK_AS2_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AS2_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AS2_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AS2_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
     public static final String CAMEL_SINK_AS2_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.as2.lazyStartProducer";
     public static final String CAMEL_SINK_AS2_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when  [...]
     public static final Boolean CAMEL_SINK_AS2_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AS2_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.as2.basicPropertyBinding";
-    public static final String CAMEL_SINK_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AS2_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.as2.autowiredEnabled";
+    public static final String CAMEL_SINK_AS2_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AS2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AS2_COMPONENT_CONFIGURATION_CONF = "camel.component.as2.configuration";
     public static final String CAMEL_SINK_AS2_COMPONENT_CONFIGURATION_DOC = "Component configuration";
     public static final String CAMEL_SINK_AS2_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -172,10 +169,9 @@ public class CamelAs2SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AS2_ENDPOINT_TARGET_PORT_NUMBER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AS2_ENDPOINT_TARGET_PORT_NUMBER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_ENDPOINT_TARGET_PORT_NUMBER_DOC);
         conf.define(CAMEL_SINK_AS2_ENDPOINT_USER_AGENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AS2_ENDPOINT_USER_AGENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_ENDPOINT_USER_AGENT_DOC);
         conf.define(CAMEL_SINK_AS2_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AS2_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AS2_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AS2_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AS2_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AS2_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AS2_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AS2_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AS2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AS2_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AS2_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_COMPONENT_CONFIGURATION_DOC);
         return conf;
     }
diff --git a/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SourceConnectorConfig.java b/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SourceConnectorConfig.java
index 4ba0550..c62b07e 100644
--- a/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SourceConnectorConfig.java
+++ b/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SourceConnectorConfig.java
@@ -117,18 +117,15 @@ public class CamelAs2SourceConnectorConfig extends CamelSourceConnectorConfig {
     public static final String CAMEL_SOURCE_AS2_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_AS2_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_AS2_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AS2_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_AS2_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_AS2_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
     public static final String CAMEL_SOURCE_AS2_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.as2.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_AS2_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_AS2_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AS2_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.as2.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AS2_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.as2.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AS2_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AS2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AS2_COMPONENT_CONFIGURATION_CONF = "camel.component.as2.configuration";
     public static final String CAMEL_SOURCE_AS2_COMPONENT_CONFIGURATION_DOC = "Component configuration";
     public static final String CAMEL_SOURCE_AS2_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -176,10 +173,9 @@ public class CamelAs2SourceConnectorConfig extends CamelSourceConnectorConfig {
         conf.define(CAMEL_SOURCE_AS2_ENDPOINT_USER_AGENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AS2_ENDPOINT_USER_AGENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_ENDPOINT_USER_AGENT_DOC);
         conf.define(CAMEL_SOURCE_AS2_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AS2_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AS2_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AS2_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AS2_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AS2_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_AS2_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AS2_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_AS2_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AS2_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AS2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AS2_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AS2_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_COMPONENT_CONFIGURATION_DOC);
         return conf;
     }
diff --git a/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-sink.json b/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-sink.json
index 5ffe733..e46bf0c 100644
--- a/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-sink.json
+++ b/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-sink.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -67,11 +60,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.asterisk.basicPropertyBinding": {
-			"name": "camel.component.asterisk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.asterisk.autowiredEnabled": {
+			"name": "camel.component.asterisk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-source.json b/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-source.json
index b68ffef..bb38c15 100644
--- a/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-source.json
+++ b/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.asterisk.basicPropertyBinding": {
-			"name": "camel.component.asterisk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.asterisk.autowiredEnabled": {
+			"name": "camel.component.asterisk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-sink-connector.adoc b/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-sink-connector.adoc
index 176c07e..4d31652 100644
--- a/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-sink-connector.adoc
+++ b/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.asterisk.CamelAsteriskSinkConnec
 ----
 
 
-The camel-asterisk sink connector supports 10 options, which are listed below.
+The camel-asterisk sink connector supports 9 options, which are listed below.
 
 
 
@@ -35,10 +35,9 @@ The camel-asterisk sink connector supports 10 options, which are listed below.
 | *camel.sink.endpoint.username* | Login username | null | true | HIGH
 | *camel.sink.endpoint.action* | What action to perform such as getting queue status, sip peers or extension state. One of: [QUEUE_STATUS] [SIP_PEERS] [EXTENSION_STATE] | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.asterisk.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
-| *camel.component.asterisk.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.asterisk.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-source-connector.adoc b/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-source-connector.adoc
index 83cacc1..cc0bfe6 100644
--- a/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-source-connector.adoc
+++ b/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.asterisk.CamelAsteriskSourceConn
 ----
 
 
-The camel-asterisk source connector supports 11 options, which are listed below.
+The camel-asterisk source connector supports 10 options, which are listed below.
 
 
 
@@ -36,10 +36,9 @@ The camel-asterisk source connector supports 11 options, which are listed below.
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.asterisk.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.asterisk.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.asterisk.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSinkConnectorConfig.java b/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSinkConnectorConfig.java
index 7f88114..d96b621 100644
--- a/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSinkConnectorConfig.java
+++ b/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSinkConnectorConfig.java
@@ -44,18 +44,15 @@ public class CamelAsteriskSinkConnectorConfig
     public static final String CAMEL_SINK_ASTERISK_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ASTERISK_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that w [...]
     public static final Boolean CAMEL_SINK_ASTERISK_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ASTERISK_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_ASTERISK_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_ASTERISK_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
     public static final String CAMEL_SINK_ASTERISK_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.asterisk.lazyStartProducer";
     public static final String CAMEL_SINK_ASTERISK_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that  [...]
     public static final Boolean CAMEL_SINK_ASTERISK_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.asterisk.basicPropertyBinding";
-    public static final String CAMEL_SINK_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.asterisk.autowiredEnabled";
+    public static final String CAMEL_SINK_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAsteriskSinkConnectorConfig(
             ConfigDef config,
@@ -75,10 +72,9 @@ public class CamelAsteriskSinkConnectorConfig
         conf.define(CAMEL_SINK_ASTERISK_ENDPOINT_USERNAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ASTERISK_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_ASTERISK_ENDPOINT_USERNAME_DOC);
         conf.define(CAMEL_SINK_ASTERISK_ENDPOINT_ACTION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ASTERISK_ENDPOINT_ACTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ASTERISK_ENDPOINT_ACTION_DOC);
         conf.define(CAMEL_SINK_ASTERISK_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ASTERISK_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ASTERISK_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ASTERISK_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ASTERISK_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ASTERISK_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_ASTERISK_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ASTERISK_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ASTERISK_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSourceConnectorConfig.java b/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSourceConnectorConfig.java
index d1bb5eb..de36bef 100644
--- a/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSourceConnectorConfig.java
+++ b/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSourceConnectorConfig.java
@@ -47,18 +47,15 @@ public class CamelAsteriskSourceConnectorConfig
     public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_ASTERISK_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
     public static final String CAMEL_SOURCE_ASTERISK_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.asterisk.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ASTERISK_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and i [...]
     public static final Boolean CAMEL_SOURCE_ASTERISK_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.asterisk.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.asterisk.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAsteriskSourceConnectorConfig(
             ConfigDef config,
@@ -79,10 +76,9 @@ public class CamelAsteriskSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ASTERISK_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ASTERISK_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ASTERISK_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ASTERISK_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_ASTERISK_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ASTERISK_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json b/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json
index 5bf8f40..db58112 100644
--- a/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json
+++ b/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.propertiesFile": {
 			"name": "camel.sink.endpoint.propertiesFile",
 			"description": "The URI of the properties file which is used for AtlasContextFactory initialization.",
@@ -88,12 +81,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atlasmap.basicPropertyBinding": {
-			"name": "camel.component.atlasmap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atlasmap.autowiredEnabled": {
+			"name": "camel.component.atlasmap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc b/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc
index 72187e3..908f76d 100644
--- a/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atlasmap.CamelAtlasmapSinkConnec
 ----
 
 
-The camel-atlasmap sink connector supports 13 options, which are listed below.
+The camel-atlasmap sink connector supports 12 options, which are listed below.
 
 
 
@@ -36,12 +36,11 @@ The camel-atlasmap sink connector supports 13 options, which are listed below.
 | *camel.sink.endpoint.sourceMapName* | The Exchange property name for a source message map which hold java.util.Map&lt;String, Message&gt; where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source properties where the scope equals to Document ID. | null | false | MEDIUM
 | *camel.sink.endpoint.targetMapMode* | TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores them into a java.util.Map, and the java.util.Map is set to an exchange property if 'targetMapName' is specified, otherwise message body. 'MESSAGE_HEADER': Stores them into message headers. 'EXCHANGE_PROPERTY': Stores them into exchange properties. ) One of: [MAP] [MESSAGE_HEADER] [EXCHANGE_PROPERTY] | "MAP" | false | MEDIUM
 | *camel.sink.endpoint.targetMapName* | The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map. | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.propertiesFile* | The URI of the properties file which is used for AtlasContextFactory initialization. | null | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.atlasmap.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.atlasmap.atlasContextFactory* | To use the AtlasContextFactory otherwise a new engine is created. | null | false | MEDIUM
-| *camel.component.atlasmap.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atlasmap.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
@@ -59,8 +58,4 @@ The camel-atlasmap sink connector has no transforms out of the box.
 
 
 The camel-atlasmap sink connector has no aggregation strategies out of the box.
-
-
-
-
 // kafka-connector options: END
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java
index 1e0a715..bda0604 100644
--- a/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java
@@ -47,9 +47,6 @@ public class CamelAtlasmapSinkConnectorConfig
     public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_CONF = "camel.sink.endpoint.targetMapName";
     public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DOC = "The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map.";
     public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DEFAULT = null;
-    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_CONF = "camel.sink.endpoint.propertiesFile";
     public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DOC = "The URI of the properties file which is used for AtlasContextFactory initialization.";
     public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DEFAULT = null;
@@ -62,9 +59,9 @@ public class CamelAtlasmapSinkConnectorConfig
     public static final String CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_CONF = "camel.component.atlasmap.atlasContextFactory";
     public static final String CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DOC = "To use the AtlasContextFactory otherwise a new engine is created.";
     public static final String CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DEFAULT = null;
-    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atlasmap.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atlasmap.autowiredEnabled";
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATLASMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAtlasmapSinkConnectorConfig(
             ConfigDef config,
@@ -85,12 +82,11 @@ public class CamelAtlasmapSinkConnectorConfig
         conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_DOC);
         conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_DOC);
         conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DOC);
-        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DOC);
         conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DOC);
-        conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-sink.json b/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-sink.json
index 76aa2e7..a9ba8c9 100644
--- a/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-sink.json
+++ b/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-sink.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmos.basicPropertyBinding": {
-			"name": "camel.component.atmos.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmos.autowiredEnabled": {
+			"name": "camel.component.atmos.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmos.uri": {
diff --git a/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-source.json b/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-source.json
index d16116c..ea5638b 100644
--- a/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-source.json
+++ b/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-source.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmos.basicPropertyBinding": {
-			"name": "camel.component.atmos.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmos.autowiredEnabled": {
+			"name": "camel.component.atmos.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmos.uri": {
diff --git a/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-sink-connector.adoc b/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-sink-connector.adoc
index 34f0ab1..f63971a 100644
--- a/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-sink-connector.adoc
+++ b/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atmos.CamelAtmosSinkConnector
 ----
 
 
-The camel-atmos sink connector supports 19 options, which are listed below.
+The camel-atmos sink connector supports 18 options, which are listed below.
 
 
 
@@ -36,14 +36,13 @@ The camel-atmos sink connector supports 19 options, which are listed below.
 | *camel.sink.endpoint.query* | Search query on Atmos | null | false | MEDIUM
 | *camel.sink.endpoint.remotePath* | Where to put files on Atmos | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.uri* | Atomos server uri | null | false | MEDIUM
 | *camel.sink.endpoint.fullTokenId* | Atmos client fullTokenId | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | The secret key to pass to the Atmos client (should be base64 encoded) | null | false | MEDIUM
 | *camel.sink.endpoint.sslValidation* | Atmos SSL validation | false | false | MEDIUM
 | *camel.component.atmos.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then c [...]
-| *camel.component.atmos.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atmos.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atmos.uri* | The URI of the server for the Atmos client to connect to | null | false | MEDIUM
 | *camel.component.atmos.fullTokenId* | The token id to pass to the Atmos client | null | false | MEDIUM
 | *camel.component.atmos.secretKey* | The secret key to pass to the Atmos client (should be base64 encoded) | null | false | MEDIUM
diff --git a/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-source-connector.adoc b/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-source-connector.adoc
index 0561f1f..582d660 100644
--- a/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-source-connector.adoc
+++ b/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atmos.CamelAtmosSourceConnector
 ----
 
 
-The camel-atmos source connector supports 21 options, which are listed below.
+The camel-atmos source connector supports 20 options, which are listed below.
 
 
 
@@ -38,14 +38,13 @@ The camel-atmos source connector supports 21 options, which are listed below.
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.uri* | Atomos server uri | null | false | MEDIUM
 | *camel.source.endpoint.fullTokenId* | Atmos client fullTokenId | null | false | MEDIUM
 | *camel.source.endpoint.secretKey* | The secret key to pass to the Atmos client (should be base64 encoded) | null | false | MEDIUM
 | *camel.source.endpoint.sslValidation* | Atmos SSL validation | false | false | MEDIUM
 | *camel.component.atmos.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atmos.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atmos.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atmos.uri* | The URI of the server for the Atmos client to connect to | null | false | MEDIUM
 | *camel.component.atmos.fullTokenId* | The token id to pass to the Atmos client | null | false | MEDIUM
 | *camel.component.atmos.secretKey* | The secret key to pass to the Atmos client (should be base64 encoded) | null | false | MEDIUM
diff --git a/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSinkConnectorConfig.java b/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSinkConnectorConfig.java
index 7a8500a..0f662d2 100644
--- a/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSinkConnectorConfig.java
+++ b/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSinkConnectorConfig.java
@@ -45,9 +45,6 @@ public class CamelAtmosSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_ATMOS_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATMOS_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when [...]
     public static final Boolean CAMEL_SINK_ATMOS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATMOS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_ATMOS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_ATMOS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -66,9 +63,9 @@ public class CamelAtmosSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_ATMOS_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atmos.lazyStartProducer";
     public static final String CAMEL_SINK_ATMOS_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that whe [...]
     public static final Boolean CAMEL_SINK_ATMOS_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atmos.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATMOS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atmos.autowiredEnabled";
+    public static final String CAMEL_SINK_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATMOS_COMPONENT_URI_CONF = "camel.component.atmos.uri";
     public static final String CAMEL_SINK_ATMOS_COMPONENT_URI_DOC = "The URI of the server for the Atmos client to connect to";
     public static final String CAMEL_SINK_ATMOS_COMPONENT_URI_DEFAULT = null;
@@ -101,14 +98,13 @@ public class CamelAtmosSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_QUERY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_ENDPOINT_QUERY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_QUERY_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_REMOTE_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_ENDPOINT_REMOTE_PATH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_REMOTE_PATH_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_URI_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_ENDPOINT_URI_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_URI_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_FULL_TOKEN_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_ENDPOINT_FULL_TOKEN_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_FULL_TOKEN_ID_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_SSL_VALIDATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_ENDPOINT_SSL_VALIDATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_SSL_VALIDATION_DOC);
         conf.define(CAMEL_SINK_ATMOS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATMOS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATMOS_COMPONENT_URI_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_COMPONENT_URI_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_COMPONENT_URI_DOC);
         conf.define(CAMEL_SINK_ATMOS_COMPONENT_FULL_TOKEN_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_COMPONENT_FULL_TOKEN_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_COMPONENT_FULL_TOKEN_ID_DOC);
         conf.define(CAMEL_SINK_ATMOS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSourceConnectorConfig.java b/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSourceConnectorConfig.java
index e9c3f05..c8c31e5 100644
--- a/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSourceConnectorConfig.java
+++ b/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSourceConnectorConfig.java
@@ -53,9 +53,6 @@ public class CamelAtmosSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_ATMOS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -74,9 +71,9 @@ public class CamelAtmosSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATMOS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atmos.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATMOS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_ATMOS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atmos.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATMOS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atmos.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATMOS_COMPONENT_URI_CONF = "camel.component.atmos.uri";
     public static final String CAMEL_SOURCE_ATMOS_COMPONENT_URI_DOC = "The URI of the server for the Atmos client to connect to";
     public static final String CAMEL_SOURCE_ATMOS_COMPONENT_URI_DEFAULT = null;
@@ -111,14 +108,13 @@ public class CamelAtmosSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_URI_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_ENDPOINT_URI_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_URI_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_FULL_TOKEN_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_ENDPOINT_FULL_TOKEN_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_FULL_TOKEN_ID_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_SSL_VALIDATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_ENDPOINT_SSL_VALIDATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_SSL_VALIDATION_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATMOS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_COMPONENT_URI_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_COMPONENT_URI_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_COMPONENT_URI_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_COMPONENT_FULL_TOKEN_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_COMPONENT_FULL_TOKEN_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_COMPONENT_FULL_TOKEN_ID_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-sink.json b/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-sink.json
index 471c142..cec8c98 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-sink.json
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-sink.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.mapHttpMessageBody": {
 			"name": "camel.sink.endpoint.mapHttpMessageBody",
 			"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.",
@@ -125,11 +118,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmosphere-websocket.basicPropertyBinding": {
-			"name": "camel.component.atmosphere-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmosphere-websocket.autowiredEnabled": {
+			"name": "camel.component.atmosphere-websocket.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmosphere-websocket.httpBinding": {
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-source.json b/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-source.json
index 6980b7d..52ac73b 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-source.json
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-source.json
@@ -155,13 +155,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.mapHttpMessageBody": {
 			"name": "camel.source.endpoint.mapHttpMessageBody",
 			"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.",
@@ -230,11 +223,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmosphere-websocket.basicPropertyBinding": {
-			"name": "camel.component.atmosphere-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmosphere-websocket.autowiredEnabled": {
+			"name": "camel.component.atmosphere-websocket.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmosphere-websocket.httpBinding": {
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-sink-connector.adoc b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-sink-connector.adoc
index 41a31b7..f3eb2c7 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-sink-connector.adoc
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atmospherewebsocket.CamelAtmosph
 ----
 
 
-The camel-atmosphere-websocket sink connector supports 21 options, which are listed below.
+The camel-atmosphere-websocket sink connector supports 20 options, which are listed below.
 
 
 
@@ -39,14 +39,13 @@ The camel-atmosphere-websocket sink connector supports 21 options, which are lis
 | *camel.sink.endpoint.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.sink.endpoint.bridgeEndpoint* | If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back. | false | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.mapHttpMessageBody* | 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. | true | false | MEDIUM
 | *camel.sink.endpoint.mapHttpMessageFormUrlEncoded Body* | 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 body mapping. | true | false | MEDIUM
 | *camel.sink.endpoint.mapHttpMessageHeaders* | 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. | true | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.atmosphere-websocket.lazyStart Producer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is  [...]
 | *camel.component.atmosphere-websocket.allowJava SerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.atmosphere-websocket.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atmosphere-websocket.autowired Enabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atmosphere-websocket.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.component.atmosphere-websocket.http Configuration* | To use the shared HttpConfiguration as base configuration. | null | false | MEDIUM
 | *camel.component.atmosphere-websocket.headerFilter Strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-source-connector.adoc b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-source-connector.adoc
index 37851f5..a1e260f 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-source-connector.adoc
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atmospherewebsocket.CamelAtmosph
 ----
 
 
-The camel-atmosphere-websocket source connector supports 37 options, which are listed below.
+The camel-atmosphere-websocket source connector supports 36 options, which are listed below.
 
 
 
@@ -51,7 +51,6 @@ The camel-atmosphere-websocket source connector supports 37 options, which are l
 | *camel.source.endpoint.fileNameExtWhitelist* | Whitelist of accepted filename extensions for accepting uploaded files. Multiple extensions can be separated by comma, such as txt,xml. | null | false | MEDIUM
 | *camel.source.endpoint.optionsEnabled* | Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off. | false | false | MEDIUM
 | *camel.source.endpoint.traceEnabled* | Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off. | false | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.mapHttpMessageBody* | 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. | true | false | MEDIUM
 | *camel.source.endpoint.mapHttpMessageFormUrlEncoded Body* | 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 body mapping. | true | false | MEDIUM
 | *camel.source.endpoint.mapHttpMessageHeaders* | 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. | true | false | MEDIUM
@@ -62,7 +61,7 @@ The camel-atmosphere-websocket source connector supports 37 options, which are l
 | *camel.component.atmosphere-websocket.fileNameExt Whitelist* | Whitelist of accepted filename extensions for accepting uploaded files. Multiple extensions can be separated by comma, such as txt,xml. | null | false | MEDIUM
 | *camel.component.atmosphere-websocket.httpRegistry* | To use a custom org.apache.camel.component.servlet.HttpRegistry. | null | false | MEDIUM
 | *camel.component.atmosphere-websocket.allowJava SerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.atmosphere-websocket.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atmosphere-websocket.autowired Enabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atmosphere-websocket.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.component.atmosphere-websocket.http Configuration* | To use the shared HttpConfiguration as base configuration. | null | false | MEDIUM
 | *camel.component.atmosphere-websocket.headerFilter Strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSinkConnectorConfig.java b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSinkConnectorConfig.java
index 4c829dd..93ca186 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSinkConnectorConfig.java
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSinkConnectorConfig.java
@@ -56,9 +56,6 @@ public class CamelAtmospherewebsocketSinkConnectorConfig
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Be [...]
     public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF = "camel.sink.endpoint.mapHttpMessageBody";
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC = "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.";
     public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT = true;
@@ -77,9 +74,9 @@ public class CamelAtmospherewebsocketSinkConnectorConfig
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.atmosphere-websocket.allowJavaSerializedObject";
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atmosphere-websocket.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atmosphere-websocket.autowiredEnabled";
+    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_CONF = "camel.component.atmosphere-websocket.httpBinding";
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DOC = "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.";
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DEFAULT = null;
@@ -113,14 +110,13 @@ public class CamelAtmospherewebsocketSinkConnectorConfig
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_HTTP_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_HTTP_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_HTTP_BINDING_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BRIDGE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BRIDGE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BRIDGE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSourceConnectorConfig.java b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSourceConnectorConfig.java
index 8f15308..489df7a 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSourceConnectorConfig.java
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSourceConnectorConfig.java
@@ -92,9 +92,6 @@ public class CamelAtmospherewebsocketSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_TRACE_ENABLED_CONF = "camel.source.endpoint.traceEnabled";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_TRACE_ENABLED_DOC = "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.";
     public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_TRACE_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF = "camel.source.endpoint.mapHttpMessageBody";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC = "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.";
     public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT = true;
@@ -125,9 +122,9 @@ public class CamelAtmospherewebsocketSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.atmosphere-websocket.allowJavaSerializedObject";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atmosphere-websocket.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atmosphere-websocket.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_CONF = "camel.component.atmosphere-websocket.httpBinding";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DOC = "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DEFAULT = null;
@@ -173,7 +170,6 @@ public class CamelAtmospherewebsocketSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_FILE_NAME_EXT_WHITELIST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_FILE_NAME_EXT_WHITELIST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_FILE_NAME_EXT_WHITELIST_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_OPTIONS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_OPTIONS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_OPTIONS_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_TRACE_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_TRACE_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_TRACE_ENABLED_DOC);
-        conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC);
@@ -184,7 +180,7 @@ public class CamelAtmospherewebsocketSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_FILE_NAME_EXT_WHITELIST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_FILE_NAME_EXT_WHITELIST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_FILE_NAME_EXT_WHITELIST_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_REGISTRY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_REGISTRY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_REGISTRY_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_CONFIGURATION_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
diff --git a/connectors/camel-atom-kafka-connector/src/generated/resources/camel-atom-source.json b/connectors/camel-atom-kafka-connector/src/generated/resources/camel-atom-source.json
index b759d6d..a690664 100644
--- a/connectors/camel-atom-kafka-connector/src/generated/resources/camel-atom-source.json
+++ b/connectors/camel-atom-kafka-connector/src/generated/resources/camel-atom-source.json
@@ -100,13 +100,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -214,11 +207,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atom.basicPropertyBinding": {
-			"name": "camel.component.atom.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atom.autowiredEnabled": {
+			"name": "camel.component.atom.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-atom-kafka-connector/src/main/docs/camel-atom-kafka-source-connector.adoc b/connectors/camel-atom-kafka-connector/src/main/docs/camel-atom-kafka-source-connector.adoc
index 335ef07..831267a 100644
--- a/connectors/camel-atom-kafka-connector/src/main/docs/camel-atom-kafka-source-connector.adoc
+++ b/connectors/camel-atom-kafka-connector/src/main/docs/camel-atom-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atom.CamelAtomSourceConnector
 ----
 
 
-The camel-atom source connector supports 32 options, which are listed below.
+The camel-atom source connector supports 31 options, which are listed below.
 
 
 
@@ -43,7 +43,6 @@ The camel-atom source connector supports 32 options, which are listed below.
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.backoffErrorThreshold* | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
 | *camel.source.endpoint.backoffIdleThreshold* | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
@@ -60,7 +59,7 @@ The camel-atom source connector supports 32 options, which are listed below.
 | *camel.source.endpoint.timeUnit* | Time unit for initialDelay and delay options. One of: [NANOSECONDS] [MICROSECONDS] [MILLISECONDS] [SECONDS] [MINUTES] [HOURS] [DAYS] | "MILLISECONDS" | false | MEDIUM
 | *camel.source.endpoint.useFixedDelay* | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | false | MEDIUM
 | *camel.component.atom.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atom.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atom.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-atom-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atom/CamelAtomSourceConnectorConfig.java b/connectors/camel-atom-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atom/CamelAtomSourceConnectorConfig.java
index 530a95b..ff95014 100644
--- a/connectors/camel-atom-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atom/CamelAtomSourceConnectorConfig.java
+++ b/connectors/camel-atom-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atom/CamelAtomSourceConnectorConfig.java
@@ -68,9 +68,6 @@ public class CamelAtomSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOM_ENDPOINT_POLL_STRATEGY_CONF = "camel.source.endpoint.pollStrategy";
     public static final String CAMEL_SOURCE_ATOM_ENDPOINT_POLL_STRATEGY_DOC = "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.";
     public static final String CAMEL_SOURCE_ATOM_ENDPOINT_POLL_STRATEGY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATOM_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOM_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOM_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATOM_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_ATOM_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_ATOM_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -119,9 +116,9 @@ public class CamelAtomSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOM_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atom.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATOM_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_ATOM_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATOM_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atom.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOM_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOM_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATOM_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atom.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATOM_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATOM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAtomSourceConnectorConfig(
             ConfigDef config,
@@ -149,7 +146,6 @@ public class CamelAtomSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOM_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOM_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOM_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_POLL_STRATEGY_DOC);
-        conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOM_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOM_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_ATOM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC);
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_ATOM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC);
@@ -166,7 +162,7 @@ public class CamelAtomSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_TIME_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOM_ENDPOINT_TIME_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_TIME_UNIT_DOC);
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_USE_FIXED_DELAY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOM_ENDPOINT_USE_FIXED_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_USE_FIXED_DELAY_DOC);
         conf.define(CAMEL_SOURCE_ATOM_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOM_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATOM_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOM_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATOM_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATOM_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-sink.json b/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-sink.json
index a003fd5..65f5bfb 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-sink.json
+++ b/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-sink.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-map.basicPropertyBinding": {
-			"name": "camel.component.atomix-map.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-map.autowiredEnabled": {
+			"name": "camel.component.atomix-map.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-map.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-source.json b/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-source.json
index 929a1db..2d54881 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-source.json
+++ b/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-source.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -198,11 +191,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-map.basicPropertyBinding": {
-			"name": "camel.component.atomix-map.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-map.autowiredEnabled": {
+			"name": "camel.component.atomix-map.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-map.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-sink-connector.adoc b/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-sink-connector.adoc
index 9f0cc2e..18662c4 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-sink-connector.adoc
+++ b/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixmap.CamelAtomixmapSinkConn
 ----
 
 
-The camel-atomix-map sink connector supports 35 options, which are listed below.
+The camel-atomix-map sink connector supports 34 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-atomix-map sink connector supports 35 options, which are listed below.
 | *camel.sink.endpoint.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.sink.endpoint.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.sink.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -57,7 +56,7 @@ The camel-atomix-map sink connector supports 35 options, which are listed below.
 | *camel.component.atomix-map.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-map.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.component.atomix-map.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...]
-| *camel.component.atomix-map.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-map.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-map.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-map.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-map.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-source-connector.adoc b/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-source-connector.adoc
index 18374ee..5400d84 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-source-connector.adoc
+++ b/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixmap.CamelAtomixmapSourceCo
 ----
 
 
-The camel-atomix-map source connector supports 37 options, which are listed below.
+The camel-atomix-map source connector supports 36 options, which are listed below.
 
 
 
@@ -41,7 +41,6 @@ The camel-atomix-map source connector supports 37 options, which are listed belo
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.source.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.source.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -59,7 +58,7 @@ The camel-atomix-map source connector supports 37 options, which are listed belo
 | *camel.component.atomix-map.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-map.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.component.atomix-map.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atomix-map.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-map.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-map.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-map.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-map.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSinkConnectorConfig.java b/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSinkConnectorConfig.java
index 99029ee..25cd408 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSinkConnectorConfig.java
+++ b/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSinkConnectorConfig.java
@@ -56,9 +56,6 @@ public class CamelAtomixmapSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that  [...]
     public static final Boolean CAMEL_SINK_ATOMIXMAP_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.sink.endpoint.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -110,9 +107,9 @@ public class CamelAtomixmapSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atomix-map.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that [...]
     public static final Boolean CAMEL_SINK_ATOMIXMAP_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-map.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-map.autowiredEnabled";
+    public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-map.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -154,7 +151,6 @@ public class CamelAtomixmapSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMAP_ENDPOINT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXMAP_ENDPOINT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_TTL_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_EPHEMERAL_DOC);
@@ -172,7 +168,7 @@ public class CamelAtomixmapSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMAP_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXMAP_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_TTL_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSourceConnectorConfig.java b/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSourceConnectorConfig.java
index f5782b9..f4371d4 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSourceConnectorConfig.java
+++ b/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSourceConnectorConfig.java
@@ -62,9 +62,6 @@ public class CamelAtomixmapSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.source.endpoint.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -116,9 +113,9 @@ public class CamelAtomixmapSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atomix-map.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and  [...]
     public static final Boolean CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-map.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-map.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-map.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -162,7 +159,6 @@ public class CamelAtomixmapSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EPHEMERAL_DOC);
@@ -180,7 +176,7 @@ public class CamelAtomixmapSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_TTL_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-sink.json b/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-sink.json
index 1e252ff..570b8df 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-sink.json
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-sink.json
@@ -79,13 +79,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -200,11 +193,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-messaging.basicPropertyBinding": {
-			"name": "camel.component.atomix-messaging.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-messaging.autowiredEnabled": {
+			"name": "camel.component.atomix-messaging.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-messaging.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-source.json b/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-source.json
index 8db866d..7f16975 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-source.json
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-source.json
@@ -91,13 +91,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -212,11 +205,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-messaging.basicPropertyBinding": {
-			"name": "camel.component.atomix-messaging.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-messaging.autowiredEnabled": {
+			"name": "camel.component.atomix-messaging.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-messaging.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-sink-connector.adoc b/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-sink-connector.adoc
index 42ed3ee..c08b38a 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-sink-connector.adoc
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixmessaging.CamelAtomixmessa
 ----
 
 
-The camel-atomix-messaging sink connector supports 37 options, which are listed below.
+The camel-atomix-messaging sink connector supports 36 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-atomix-messaging sink connector supports 37 options, which are listed
 | *camel.sink.endpoint.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.sink.endpoint.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.sink.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -59,7 +58,7 @@ The camel-atomix-messaging sink connector supports 37 options, which are listed
 | *camel.component.atomix-messaging.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.component.atomix-messaging.transportClass Name* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-messaging.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is proce [...]
-| *camel.component.atomix-messaging.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-messaging.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-messaging.defaultResource Config* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-messaging.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-messaging.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-source-connector.adoc b/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-source-connector.adoc
index e5a81d8..a716469 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-source-connector.adoc
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixmessaging.CamelAtomixmessa
 ----
 
 
-The camel-atomix-messaging source connector supports 39 options, which are listed below.
+The camel-atomix-messaging source connector supports 38 options, which are listed below.
 
 
 
@@ -42,7 +42,6 @@ The camel-atomix-messaging source connector supports 39 options, which are liste
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.source.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.source.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -61,7 +60,7 @@ The camel-atomix-messaging source connector supports 39 options, which are liste
 | *camel.component.atomix-messaging.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.component.atomix-messaging.transportClass Name* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-messaging.bridgeError Handler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atomix-messaging.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-messaging.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-messaging.defaultResource Config* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-messaging.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-messaging.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSinkConnectorConfig.java b/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSinkConnectorConfig.java
index 07bc6ac..a03c074 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSinkConnectorConfig.java
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSinkConnectorConfig.java
@@ -59,9 +59,6 @@ public class CamelAtomixmessagingSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware [...]
     public static final Boolean CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.sink.endpoint.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -116,9 +113,9 @@ public class CamelAtomixmessagingSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atomix-messaging.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Bewar [...]
     public static final Boolean CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-messaging.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-messaging.autowiredEnabled";
+    public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-messaging.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -162,7 +159,6 @@ public class CamelAtomixmessagingSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_EPHEMERAL_DOC);
@@ -181,7 +177,7 @@ public class CamelAtomixmessagingSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSourceConnectorConfig.java b/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSourceConnectorConfig.java
index 996d158..261816a 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSourceConnectorConfig.java
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSourceConnectorConfig.java
@@ -65,9 +65,6 @@ public class CamelAtomixmessagingSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.source.endpoint.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -122,9 +119,9 @@ public class CamelAtomixmessagingSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atomix-messaging.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR leve [...]
     public static final Boolean CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-messaging.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-messaging.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-messaging.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -170,7 +167,6 @@ public class CamelAtomixmessagingSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EPHEMERAL_DOC);
@@ -189,7 +185,7 @@ public class CamelAtomixmessagingSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-multimap-kafka-connector/src/generated/resources/camel-atomix-multimap-sink.json b/connectors/camel-atomix-multimap-kafka-connector/src/generated/resources/camel-atomix-multimap-sink.json
index 81ffc22..3b6e3b7 100644
--- a/connectors/camel-atomix-multimap-kafka-connector/src/generated/resources/camel-atomix-multimap-sink.json
+++ b/connectors/camel-atomix-multimap-kafka-connector/src/generated/resources/camel-atomix-multimap-sink.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-multimap.basicPropertyBinding": {
-			"name": "camel.component.atomix-multimap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-multimap.autowiredEnabled": {
+			"name": "camel.component.atomix-multimap.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-multimap.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-multimap-kafka-connector/src/main/docs/camel-atomix-multimap-kafka-sink-connector.adoc b/connectors/camel-atomix-multimap-kafka-connector/src/main/docs/camel-atomix-multimap-kafka-sink-connector.adoc
index 1abe7c0..205d3de 100644
--- a/connectors/camel-atomix-multimap-kafka-connector/src/main/docs/camel-atomix-multimap-kafka-sink-connector.adoc
+++ b/connectors/camel-atomix-multimap-kafka-connector/src/main/docs/camel-atomix-multimap-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixmultimap.CamelAtomixmultim
 ----
 
 
-The camel-atomix-multimap sink connector supports 35 options, which are listed below.
+The camel-atomix-multimap sink connector supports 34 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-atomix-multimap sink connector supports 35 options, which are listed b
 | *camel.sink.endpoint.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.sink.endpoint.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.sink.endpoint.ttl* | The resource ttl. | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.sink.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -57,7 +56,7 @@ The camel-atomix-multimap sink connector supports 35 options, which are listed b
 | *camel.component.atomix-multimap.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.component.atomix-multimap.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-multimap.ttl* | The resource ttl. | null | false | MEDIUM
-| *camel.component.atomix-multimap.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-multimap.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-multimap.defaultResource Config* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-multimap.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-multimap.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-multimap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmultimap/CamelAtomixmultimapSinkConnectorConfig.java b/connectors/camel-atomix-multimap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmultimap/CamelAtomixmultimapSinkConnectorConfig.java
index 0714a83..311e1a2 100644
--- a/connectors/camel-atomix-multimap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmultimap/CamelAtomixmultimapSinkConnectorConfig.java
+++ b/connectors/camel-atomix-multimap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmultimap/CamelAtomixmultimapSinkConnectorConfig.java
@@ -56,9 +56,6 @@ public class CamelAtomixmultimapSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TTL_CONF = "camel.sink.endpoint.ttl";
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TTL_DOC = "The resource ttl.";
     public static final Long CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TTL_DEFAULT = null;
-    public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.sink.endpoint.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -110,9 +107,9 @@ public class CamelAtomixmultimapSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TTL_CONF = "camel.component.atomix-multimap.ttl";
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TTL_DOC = "The resource ttl.";
     public static final Long CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TTL_DEFAULT = null;
-    public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-multimap.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-multimap.autowiredEnabled";
+    public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-multimap.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -155,7 +152,6 @@ public class CamelAtomixmultimapSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TTL_DOC);
-        conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_EPHEMERAL_DOC);
@@ -173,7 +169,7 @@ public class CamelAtomixmultimapSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TTL_DOC);
-        conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-sink.json b/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-sink.json
index ad929a3..46bf77f 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-sink.json
+++ b/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -162,11 +155,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-queue.basicPropertyBinding": {
-			"name": "camel.component.atomix-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-queue.autowiredEnabled": {
+			"name": "camel.component.atomix-queue.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-queue.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-source.json b/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-source.json
index fd1c961..db3757b 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-source.json
+++ b/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-source.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -174,11 +167,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-queue.basicPropertyBinding": {
-			"name": "camel.component.atomix-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-queue.autowiredEnabled": {
+			"name": "camel.component.atomix-queue.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-queue.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-sink-connector.adoc b/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-sink-connector.adoc
index ce7c91f..c98139b 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-sink-connector.adoc
+++ b/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixqueue.CamelAtomixqueueSink
 ----
 
 
-The camel-atomix-queue sink connector supports 31 options, which are listed below.
+The camel-atomix-queue sink connector supports 30 options, which are listed below.
 
 
 
@@ -37,7 +37,6 @@ The camel-atomix-queue sink connector supports 31 options, which are listed belo
 | *camel.sink.endpoint.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.sink.endpoint.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.sink.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-atomix-queue sink connector supports 31 options, which are listed belo
 | *camel.component.atomix-queue.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.component.atomix-queue.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-queue.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed [...]
-| *camel.component.atomix-queue.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-queue.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-queue.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-queue.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-queue.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-source-connector.adoc b/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-source-connector.adoc
index 04e910b..1c825f7 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-source-connector.adoc
+++ b/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixqueue.CamelAtomixqueueSour
 ----
 
 
-The camel-atomix-queue source connector supports 33 options, which are listed below.
+The camel-atomix-queue source connector supports 32 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-atomix-queue source connector supports 33 options, which are listed be
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.source.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.source.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -55,7 +54,7 @@ The camel-atomix-queue source connector supports 33 options, which are listed be
 | *camel.component.atomix-queue.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.component.atomix-queue.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-queue.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atomix-queue.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-queue.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-queue.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-queue.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-queue.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSinkConnectorConfig.java b/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSinkConnectorConfig.java
index 025bba5..ea0ea2a 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSinkConnectorConfig.java
+++ b/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSinkConnectorConfig.java
@@ -50,9 +50,6 @@ public class CamelAtomixqueueSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware tha [...]
     public static final Boolean CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.sink.endpoint.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -98,9 +95,9 @@ public class CamelAtomixqueueSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atomix-queue.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware th [...]
     public static final Boolean CAMEL_SINK_ATOMIXQUEUE_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-queue.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-queue.autowiredEnabled";
+    public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-queue.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -140,7 +137,6 @@ public class CamelAtomixqueueSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_EPHEMERAL_DOC);
@@ -156,7 +152,7 @@ public class CamelAtomixqueueSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSourceConnectorConfig.java b/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSourceConnectorConfig.java
index 635ba03..4eb5851 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSourceConnectorConfig.java
+++ b/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSourceConnectorConfig.java
@@ -56,9 +56,6 @@ public class CamelAtomixqueueSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.source.endpoint.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -104,9 +101,9 @@ public class CamelAtomixqueueSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atomix-queue.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level an [...]
     public static final Boolean CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-queue.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-queue.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-queue.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -149,7 +146,6 @@ public class CamelAtomixqueueSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EPHEMERAL_DOC);
@@ -165,7 +161,7 @@ public class CamelAtomixqueueSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-sink.json b/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-sink.json
index 43c8814..fd759f5 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-sink.json
+++ b/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -174,11 +167,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-set.basicPropertyBinding": {
-			"name": "camel.component.atomix-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-set.autowiredEnabled": {
+			"name": "camel.component.atomix-set.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-set.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-source.json b/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-source.json
index 2b1c264..52fd093 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-source.json
+++ b/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-set.basicPropertyBinding": {
-			"name": "camel.component.atomix-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-set.autowiredEnabled": {
+			"name": "camel.component.atomix-set.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-set.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-sink-connector.adoc b/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-sink-connector.adoc
index 1233317..d62f71f 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-sink-connector.adoc
+++ b/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixset.CamelAtomixsetSinkConn
 ----
 
 
-The camel-atomix-set sink connector supports 33 options, which are listed below.
+The camel-atomix-set sink connector supports 32 options, which are listed below.
 
 
 
@@ -38,7 +38,6 @@ The camel-atomix-set sink connector supports 33 options, which are listed below.
 | *camel.sink.endpoint.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.sink.endpoint.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.sink.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -55,7 +54,7 @@ The camel-atomix-set sink connector supports 33 options, which are listed below.
 | *camel.component.atomix-set.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-set.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.component.atomix-set.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...]
-| *camel.component.atomix-set.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-set.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-set.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-set.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-set.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-source-connector.adoc b/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-source-connector.adoc
index 9f6af8f..0e22097 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-source-connector.adoc
+++ b/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixset.CamelAtomixsetSourceCo
 ----
 
 
-The camel-atomix-set source connector supports 35 options, which are listed below.
+The camel-atomix-set source connector supports 34 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-atomix-set source connector supports 35 options, which are listed belo
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.source.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.source.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -57,7 +56,7 @@ The camel-atomix-set source connector supports 35 options, which are listed belo
 | *camel.component.atomix-set.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-set.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.component.atomix-set.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atomix-set.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-set.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-set.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-set.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-set.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSinkConnectorConfig.java b/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSinkConnectorConfig.java
index f94a13b..7b2e9c6 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSinkConnectorConfig.java
+++ b/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSinkConnectorConfig.java
@@ -53,9 +53,6 @@ public class CamelAtomixsetSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that  [...]
     public static final Boolean CAMEL_SINK_ATOMIXSET_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.sink.endpoint.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -104,9 +101,9 @@ public class CamelAtomixsetSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atomix-set.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that [...]
     public static final Boolean CAMEL_SINK_ATOMIXSET_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-set.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-set.autowiredEnabled";
+    public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-set.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -147,7 +144,6 @@ public class CamelAtomixsetSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXSET_ENDPOINT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXSET_ENDPOINT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_TTL_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_EPHEMERAL_DOC);
@@ -164,7 +160,7 @@ public class CamelAtomixsetSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXSET_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXSET_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_TTL_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSourceConnectorConfig.java b/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSourceConnectorConfig.java
index f5e8e31..5156937 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSourceConnectorConfig.java
+++ b/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSourceConnectorConfig.java
@@ -59,9 +59,6 @@ public class CamelAtomixsetSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.source.endpoint.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -110,9 +107,9 @@ public class CamelAtomixsetSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atomix-set.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and  [...]
     public static final Boolean CAMEL_SOURCE_ATOMIXSET_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-set.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-set.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-set.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -155,7 +152,6 @@ public class CamelAtomixsetSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EPHEMERAL_DOC);
@@ -172,7 +168,7 @@ public class CamelAtomixsetSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_ATOMIXSET_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_TTL_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-sink.json b/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-sink.json
index caa6fec..e661b78 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-sink.json
+++ b/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -174,11 +167,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-value.basicPropertyBinding": {
-			"name": "camel.component.atomix-value.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-value.autowiredEnabled": {
+			"name": "camel.component.atomix-value.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-value.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-source.json b/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-source.json
index 6fc8726..4c45c3a 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-source.json
+++ b/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-value.basicPropertyBinding": {
-			"name": "camel.component.atomix-value.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-value.autowiredEnabled": {
+			"name": "camel.component.atomix-value.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-value.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-sink-connector.adoc b/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-sink-connector.adoc
index 5fb7795..acab26e 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-sink-connector.adoc
+++ b/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixvalue.CamelAtomixvalueSink
 ----
 
 
-The camel-atomix-value sink connector supports 33 options, which are listed below.
+The camel-atomix-value sink connector supports 32 options, which are listed below.
 
 
 
@@ -38,7 +38,6 @@ The camel-atomix-value sink connector supports 33 options, which are listed belo
 | *camel.sink.endpoint.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.sink.endpoint.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.sink.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -55,7 +54,7 @@ The camel-atomix-value sink connector supports 33 options, which are listed belo
 | *camel.component.atomix-value.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-value.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.component.atomix-value.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed [...]
-| *camel.component.atomix-value.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-value.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-value.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-value.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-value.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-source-connector.adoc b/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-source-connector.adoc
index 6ca4039..ba6cd1d 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-source-connector.adoc
+++ b/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixvalue.CamelAtomixvalueSour
 ----
 
 
-The camel-atomix-value source connector supports 35 options, which are listed below.
+The camel-atomix-value source connector supports 34 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-atomix-value source connector supports 35 options, which are listed be
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.source.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.source.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -57,7 +56,7 @@ The camel-atomix-value source connector supports 35 options, which are listed be
 | *camel.component.atomix-value.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-value.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.component.atomix-value.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atomix-value.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-value.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-value.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-value.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-value.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSinkConnectorConfig.java b/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSinkConnectorConfig.java
index 1b95a47..a9d227a 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSinkConnectorConfig.java
+++ b/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSinkConnectorConfig.java
@@ -53,9 +53,6 @@ public class CamelAtomixvalueSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware tha [...]
     public static final Boolean CAMEL_SINK_ATOMIXVALUE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.sink.endpoint.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -104,9 +101,9 @@ public class CamelAtomixvalueSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atomix-value.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware th [...]
     public static final Boolean CAMEL_SINK_ATOMIXVALUE_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-value.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-value.autowiredEnabled";
+    public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-value.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -147,7 +144,6 @@ public class CamelAtomixvalueSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_TTL_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_EPHEMERAL_DOC);
@@ -164,7 +160,7 @@ public class CamelAtomixvalueSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXVALUE_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXVALUE_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_TTL_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSourceConnectorConfig.java b/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSourceConnectorConfig.java
index e4d3fd9..89221a6 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSourceConnectorConfig.java
+++ b/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSourceConnectorConfig.java
@@ -59,9 +59,6 @@ public class CamelAtomixvalueSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.source.endpoint.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -110,9 +107,9 @@ public class CamelAtomixvalueSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atomix-value.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level an [...]
     public static final Boolean CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-value.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-value.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-value.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -156,7 +153,6 @@ public class CamelAtomixvalueSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EPHEMERAL_DOC);
@@ -173,7 +169,7 @@ public class CamelAtomixvalueSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_TTL_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-sink.json b/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-sink.json
index ec3209f..fc86f1e 100644
--- a/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-sink.json
+++ b/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,11 +130,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.avro.basicPropertyBinding": {
-			"name": "camel.component.avro.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.avro.autowiredEnabled": {
+			"name": "camel.component.avro.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.avro.configuration": {
diff --git a/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-source.json b/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-source.json
index 0d60fc9..4494919 100644
--- a/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-source.json
+++ b/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-source.json
@@ -90,13 +90,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -149,11 +142,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.avro.basicPropertyBinding": {
-			"name": "camel.component.avro.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.avro.autowiredEnabled": {
+			"name": "camel.component.avro.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.avro.configuration": {
diff --git a/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-sink-connector.adoc b/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-sink-connector.adoc
index 01630f2..45aa9ba 100644
--- a/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-sink-connector.adoc
+++ b/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.avro.CamelAvroSinkConnector
 ----
 
 
-The camel-avro sink connector supports 22 options, which are listed below.
+The camel-avro sink connector supports 21 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-avro sink connector supports 22 options, which are listed below.
 | *camel.sink.endpoint.singleParameter* | If true, consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message | false | false | MEDIUM
 | *camel.sink.endpoint.uriAuthority* | Authority to use (username and password) | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.avro.protocol* | Avro protocol to use | null | false | MEDIUM
 | *camel.component.avro.protocolClassName* | Avro protocol to use defined by the FQN class name | null | false | MEDIUM
@@ -49,7 +48,7 @@ The camel-avro sink connector supports 22 options, which are listed below.
 | *camel.component.avro.singleParameter* | If true, consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message | false | false | MEDIUM
 | *camel.component.avro.uriAuthority* | Authority to use (username and password) | null | false | MEDIUM
 | *camel.component.avro.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cr [...]
-| *camel.component.avro.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.avro.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.avro.configuration* | To use a shared AvroConfiguration to configure options once | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-source-connector.adoc b/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-source-connector.adoc
index 23c810c..3838645 100644
--- a/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-source-connector.adoc
+++ b/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.avro.CamelAvroSourceConnector
 ----
 
 
-The camel-avro source connector supports 24 options, which are listed below.
+The camel-avro source connector supports 23 options, which are listed below.
 
 
 
@@ -42,7 +42,6 @@ The camel-avro source connector supports 24 options, which are listed below.
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.avro.protocol* | Avro protocol to use | null | false | MEDIUM
 | *camel.component.avro.protocolClassName* | Avro protocol to use defined by the FQN class name | null | false | MEDIUM
@@ -51,7 +50,7 @@ The camel-avro source connector supports 24 options, which are listed below.
 | *camel.component.avro.singleParameter* | If true, consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message | false | false | MEDIUM
 | *camel.component.avro.uriAuthority* | Authority to use (username and password) | null | false | MEDIUM
 | *camel.component.avro.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.avro.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.avro.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.avro.configuration* | To use a shared AvroConfiguration to configure options once | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSinkConnectorConfig.java b/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSinkConnectorConfig.java
index 1fe4e84..b435bb2 100644
--- a/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSinkConnectorConfig.java
+++ b/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAvroSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AVRO_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_AVRO_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when  [...]
     public static final Boolean CAMEL_SINK_AVRO_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AVRO_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AVRO_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AVRO_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -84,9 +81,9 @@ public class CamelAvroSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AVRO_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.avro.lazyStartProducer";
     public static final String CAMEL_SINK_AVRO_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when [...]
     public static final Boolean CAMEL_SINK_AVRO_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.avro.basicPropertyBinding";
-    public static final String CAMEL_SINK_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AVRO_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.avro.autowiredEnabled";
+    public static final String CAMEL_SINK_AVRO_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AVRO_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AVRO_COMPONENT_CONFIGURATION_CONF = "camel.component.avro.configuration";
     public static final String CAMEL_SINK_AVRO_COMPONENT_CONFIGURATION_DOC = "To use a shared AvroConfiguration to configure options once";
     public static final String CAMEL_SINK_AVRO_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -114,7 +111,6 @@ public class CamelAvroSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AVRO_ENDPOINT_SINGLE_PARAMETER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_ENDPOINT_SINGLE_PARAMETER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_ENDPOINT_SINGLE_PARAMETER_DOC);
         conf.define(CAMEL_SINK_AVRO_ENDPOINT_URI_AUTHORITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AVRO_ENDPOINT_URI_AUTHORITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_ENDPOINT_URI_AUTHORITY_DOC);
         conf.define(CAMEL_SINK_AVRO_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AVRO_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AVRO_COMPONENT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AVRO_COMPONENT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AVRO_COMPONENT_PROTOCOL_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AVRO_COMPONENT_PROTOCOL_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_PROTOCOL_CLASS_NAME_DOC);
@@ -123,7 +119,7 @@ public class CamelAvroSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AVRO_COMPONENT_SINGLE_PARAMETER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_COMPONENT_SINGLE_PARAMETER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_SINGLE_PARAMETER_DOC);
         conf.define(CAMEL_SINK_AVRO_COMPONENT_URI_AUTHORITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AVRO_COMPONENT_URI_AUTHORITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_URI_AUTHORITY_DOC);
         conf.define(CAMEL_SINK_AVRO_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AVRO_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AVRO_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AVRO_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_CONFIGURATION_DOC);
         return conf;
     }
diff --git a/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSourceConnectorConfig.java b/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSourceConnectorConfig.java
index 3ad9e86..be6f8a3 100644
--- a/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSourceConnectorConfig.java
+++ b/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSourceConnectorConfig.java
@@ -65,9 +65,6 @@ public class CamelAvroSourceConnectorConfig
     public static final String CAMEL_SOURCE_AVRO_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_AVRO_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_AVRO_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AVRO_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_AVRO_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_AVRO_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -92,9 +89,9 @@ public class CamelAvroSourceConnectorConfig
     public static final String CAMEL_SOURCE_AVRO_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.avro.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_AVRO_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_AVRO_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.avro.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AVRO_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.avro.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AVRO_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AVRO_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AVRO_COMPONENT_CONFIGURATION_CONF = "camel.component.avro.configuration";
     public static final String CAMEL_SOURCE_AVRO_COMPONENT_CONFIGURATION_DOC = "To use a shared AvroConfiguration to configure options once";
     public static final String CAMEL_SOURCE_AVRO_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -124,7 +121,6 @@ public class CamelAvroSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AVRO_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AVRO_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AVRO_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AVRO_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AVRO_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AVRO_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_AVRO_COMPONENT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AVRO_COMPONENT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AVRO_COMPONENT_PROTOCOL_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AVRO_COMPONENT_PROTOCOL_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_PROTOCOL_CLASS_NAME_DOC);
@@ -133,7 +129,7 @@ public class CamelAvroSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AVRO_COMPONENT_SINGLE_PARAMETER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_COMPONENT_SINGLE_PARAMETER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_SINGLE_PARAMETER_DOC);
         conf.define(CAMEL_SOURCE_AVRO_COMPONENT_URI_AUTHORITY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AVRO_COMPONENT_URI_AUTHORITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_URI_AUTHORITY_DOC);
         conf.define(CAMEL_SOURCE_AVRO_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AVRO_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AVRO_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AVRO_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_CONFIGURATION_DOC);
         return conf;
     }
diff --git a/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-sink.json b/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-sink.json
index 793e21f..8c612d1 100644
--- a/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-sink.json
+++ b/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -185,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-cw.basicPropertyBinding": {
-			"name": "camel.component.aws-cw.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-cw.autowiredEnabled": {
+			"name": "camel.component.aws-cw.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-cw.accessKey": {
diff --git a/connectors/camel-aws-cw-kafka-connector/src/main/docs/camel-aws-cw-kafka-sink-connector.adoc b/connectors/camel-aws-cw-kafka-connector/src/main/docs/camel-aws-cw-kafka-sink-connector.adoc
index d279871..6374165 100644
--- a/connectors/camel-aws-cw-kafka-connector/src/main/docs/camel-aws-cw-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-cw-kafka-connector/src/main/docs/camel-aws-cw-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awscw.CamelAwscwSinkConnector
 ----
 
 
-The camel-aws-cw sink connector supports 31 options, which are listed below.
+The camel-aws-cw sink connector supports 30 options, which are listed below.
 
 
 
@@ -41,7 +41,6 @@ The camel-aws-cw sink connector supports 31 options, which are listed below.
 | *camel.sink.endpoint.timestamp* | The metric timestamp | null | false | MEDIUM
 | *camel.sink.endpoint.unit* | The metric unit | null | false | MEDIUM
 | *camel.sink.endpoint.value* | The metric value | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -57,7 +56,7 @@ The camel-aws-cw sink connector supports 31 options, which are listed below.
 | *camel.component.aws-cw.timestamp* | The metric timestamp | null | false | MEDIUM
 | *camel.component.aws-cw.unit* | The metric unit | null | false | MEDIUM
 | *camel.component.aws-cw.value* | The metric value | null | false | MEDIUM
-| *camel.component.aws-cw.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-cw.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-cw.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-cw.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnectorConfig.java b/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnectorConfig.java
index 9449f47..ba028a7 100644
--- a/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnectorConfig.java
+++ b/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnectorConfig.java
@@ -60,9 +60,6 @@ public class CamelAwscwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSCW_ENDPOINT_VALUE_CONF = "camel.sink.endpoint.value";
     public static final String CAMEL_SINK_AWSCW_ENDPOINT_VALUE_DOC = "The metric value";
     public static final String CAMEL_SINK_AWSCW_ENDPOINT_VALUE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSCW_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSCW_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSCW_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSCW_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -108,9 +105,9 @@ public class CamelAwscwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSCW_COMPONENT_VALUE_CONF = "camel.component.aws-cw.value";
     public static final String CAMEL_SINK_AWSCW_COMPONENT_VALUE_DOC = "The metric value";
     public static final String CAMEL_SINK_AWSCW_COMPONENT_VALUE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-cw.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSCW_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSCW_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-cw.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSCW_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSCW_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSCW_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-cw.accessKey";
     public static final String CAMEL_SINK_AWSCW_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSCW_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -142,7 +139,6 @@ public class CamelAwscwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSCW_ENDPOINT_TIMESTAMP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_TIMESTAMP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_TIMESTAMP_DOC);
         conf.define(CAMEL_SINK_AWSCW_ENDPOINT_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_UNIT_DOC);
         conf.define(CAMEL_SINK_AWSCW_ENDPOINT_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_VALUE_DOC);
-        conf.define(CAMEL_SINK_AWSCW_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCW_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSCW_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCW_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSCW_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSCW_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_SECRET_KEY_DOC);
@@ -158,7 +154,7 @@ public class CamelAwscwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSCW_COMPONENT_TIMESTAMP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_TIMESTAMP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_TIMESTAMP_DOC);
         conf.define(CAMEL_SINK_AWSCW_COMPONENT_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_UNIT_DOC);
         conf.define(CAMEL_SINK_AWSCW_COMPONENT_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_VALUE_DOC);
-        conf.define(CAMEL_SINK_AWSCW_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCW_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSCW_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSCW_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCW_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSCW_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSCW_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-sink.json b/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-sink.json
index 4b5b1d1..408e5d3 100644
--- a/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-sink.json
+++ b/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-sink.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -213,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ddb.basicPropertyBinding": {
-			"name": "camel.component.aws-ddb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ddb.autowiredEnabled": {
+			"name": "camel.component.aws-ddb.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-ddb.accessKey": {
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/main/docs/camel-aws-ddb-kafka-sink-connector.adoc b/connectors/camel-aws-ddb-kafka-connector/src/main/docs/camel-aws-ddb-kafka-sink-connector.adoc
index 34b68b2..6c08ae3 100644
--- a/connectors/camel-aws-ddb-kafka-connector/src/main/docs/camel-aws-ddb-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-ddb-kafka-connector/src/main/docs/camel-aws-ddb-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsddb.CamelAwsddbSinkConnector
 ----
 
 
-The camel-aws-ddb sink connector supports 35 options, which are listed below.
+The camel-aws-ddb sink connector supports 34 options, which are listed below.
 
 
 
@@ -43,7 +43,6 @@ The camel-aws-ddb sink connector supports 35 options, which are listed below.
 | *camel.sink.endpoint.readCapacity* | The provisioned throughput to reserve for reading resources from your table | null | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which DDB client needs to work | null | false | MEDIUM
 | *camel.sink.endpoint.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -61,7 +60,7 @@ The camel-aws-ddb sink connector supports 35 options, which are listed below.
 | *camel.component.aws-ddb.readCapacity* | The provisioned throughput to reserve for reading resources from your table | null | false | MEDIUM
 | *camel.component.aws-ddb.region* | The region in which DDB client needs to work | null | false | MEDIUM
 | *camel.component.aws-ddb.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
-| *camel.component.aws-ddb.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-ddb.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-ddb.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-ddb.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnectorConfig.java b/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnectorConfig.java
index b87b16b..9f17211 100644
--- a/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnectorConfig.java
+++ b/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnectorConfig.java
@@ -66,9 +66,6 @@ public class CamelAwsddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSDDB_ENDPOINT_WRITE_CAPACITY_CONF = "camel.sink.endpoint.writeCapacity";
     public static final String CAMEL_SINK_AWSDDB_ENDPOINT_WRITE_CAPACITY_DOC = "The provisioned throughput to reserved for writing resources to your table";
     public static final String CAMEL_SINK_AWSDDB_ENDPOINT_WRITE_CAPACITY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSDDB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSDDB_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSDDB_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSDDB_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -120,9 +117,9 @@ public class CamelAwsddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSDDB_COMPONENT_WRITE_CAPACITY_CONF = "camel.component.aws-ddb.writeCapacity";
     public static final String CAMEL_SINK_AWSDDB_COMPONENT_WRITE_CAPACITY_DOC = "The provisioned throughput to reserved for writing resources to your table";
     public static final String CAMEL_SINK_AWSDDB_COMPONENT_WRITE_CAPACITY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-ddb.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSDDB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSDDB_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-ddb.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSDDB_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSDDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSDDB_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-ddb.accessKey";
     public static final String CAMEL_SINK_AWSDDB_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSDDB_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -156,7 +153,6 @@ public class CamelAwsddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_READ_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_READ_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_READ_CAPACITY_DOC);
         conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_WRITE_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_WRITE_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_WRITE_CAPACITY_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_SECRET_KEY_DOC);
@@ -174,7 +170,7 @@ public class CamelAwsddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSDDB_COMPONENT_READ_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_READ_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_READ_CAPACITY_DOC);
         conf.define(CAMEL_SINK_AWSDDB_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSDDB_COMPONENT_WRITE_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_WRITE_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_WRITE_CAPACITY_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSDDB_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSDDB_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSDDB_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-source.json b/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-source.json
index 4d82a94..a5fd1bf 100644
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-source.json
+++ b/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-source.json
@@ -104,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -293,11 +286,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ddbstream.basicPropertyBinding": {
-			"name": "camel.component.aws-ddbstream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ddbstream.autowiredEnabled": {
+			"name": "camel.component.aws-ddbstream.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-ddbstream.accessKey": {
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/camel-aws-ddbstream-kafka-source-connector.adoc b/connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/camel-aws-ddbstream-kafka-source-connector.adoc
index 559efab..a8a2842 100644
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/camel-aws-ddbstream-kafka-source-connector.adoc
+++ b/connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/camel-aws-ddbstream-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsddbstream.CamelAwsddbstreamSo
 ----
 
 
-The camel-aws-ddbstream source connector supports 47 options, which are listed below.
+The camel-aws-ddbstream source connector supports 46 options, which are listed below.
 
 
 
@@ -44,7 +44,6 @@ The camel-aws-ddbstream source connector supports 47 options, which are listed b
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.backoffErrorThreshold* | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
 | *camel.source.endpoint.backoffIdleThreshold* | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
@@ -73,7 +72,7 @@ The camel-aws-ddbstream source connector supports 47 options, which are listed b
 | *camel.component.aws-ddbstream.proxyProtocol* | To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-ddbstream.region* | The region in which DDBStreams client needs to work | null | false | MEDIUM
 | *camel.component.aws-ddbstream.sequenceNumber Provider* | Provider for the sequence number when using one of the two ShardIteratorType.{AT,AFTER}_SEQUENCE_NUMBER iterator types. Can be a registry reference or a literal sequence number. | null | false | MEDIUM
-| *camel.component.aws-ddbstream.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-ddbstream.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-ddbstream.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-ddbstream.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnectorConfig.java b/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnectorConfig.java
index bf62a64..c6345fc 100644
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnectorConfig.java
+++ b/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnectorConfig.java
@@ -71,9 +71,6 @@ public class CamelAwsddbstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_POLL_STRATEGY_CONF = "camel.source.endpoint.pollStrategy";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_POLL_STRATEGY_DOC = "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_POLL_STRATEGY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -158,9 +155,9 @@ public class CamelAwsddbstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_CONF = "camel.component.aws-ddbstream.sequenceNumberProvider";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_DOC = "Provider for the sequence number when using one of the two ShardIteratorType.{AT,AFTER}_SEQUENCE_NUMBER iterator types. Can be a registry reference or a literal sequence number.";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-ddbstream.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-ddbstream.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-ddbstream.accessKey";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -196,7 +193,6 @@ public class CamelAwsddbstreamSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_POLL_STRATEGY_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC);
@@ -225,7 +221,7 @@ public class CamelAwsddbstreamSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-ec2-kafka-connector/src/generated/resources/camel-aws-ec2-sink.json b/connectors/camel-aws-ec2-kafka-connector/src/generated/resources/camel-aws-ec2-sink.json
index dfc8181..9f8e241 100644
--- a/connectors/camel-aws-ec2-kafka-connector/src/generated/resources/camel-aws-ec2-sink.json
+++ b/connectors/camel-aws-ec2-kafka-connector/src/generated/resources/camel-aws-ec2-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ec2.basicPropertyBinding": {
-			"name": "camel.component.aws-ec2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ec2.autowiredEnabled": {
+			"name": "camel.component.aws-ec2.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-ec2-kafka-connector/src/main/docs/camel-aws-ec2-kafka-sink-connector.adoc b/connectors/camel-aws-ec2-kafka-connector/src/main/docs/camel-aws-ec2-kafka-sink-connector.adoc
index 30f31e8..6e2d8b9 100644
--- a/connectors/camel-aws-ec2-kafka-connector/src/main/docs/camel-aws-ec2-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-ec2-kafka-connector/src/main/docs/camel-aws-ec2-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsec2.CamelAwsec2SinkConnector
 ----
 
 
-The camel-aws-ec2 sink connector supports 25 options, which are listed below.
+The camel-aws-ec2 sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-ec2 sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the EC2 client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which ECS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-ec2.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-ec2.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-ec2 sink connector supports 25 options, which are listed below.
 | *camel.component.aws-ec2.proxyProtocol* | To define a proxy protocol when instantiating the EC2 client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-ec2.region* | The region in which ECS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws-ec2.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-ec2.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-ec2.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnectorConfig.java b/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnectorConfig.java
index e945b08..8645b11 100644
--- a/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnectorConfig.java
+++ b/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwsec2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSEC2_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSEC2_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSEC2_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSEC2_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwsec2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-ec2.secretKey";
     public static final String CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-ec2.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSEC2_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSEC2_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-ec2.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSEC2_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSEC2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwsec2SinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwsec2SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSEC2_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSEC2_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwsec2SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSEC2_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSEC2_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSEC2_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ecs-kafka-connector/src/generated/resources/camel-aws-ecs-sink.json b/connectors/camel-aws-ecs-kafka-connector/src/generated/resources/camel-aws-ecs-sink.json
index b8386f7..aeaca5c 100644
--- a/connectors/camel-aws-ecs-kafka-connector/src/generated/resources/camel-aws-ecs-sink.json
+++ b/connectors/camel-aws-ecs-kafka-connector/src/generated/resources/camel-aws-ecs-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ecs.basicPropertyBinding": {
-			"name": "camel.component.aws-ecs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ecs.autowiredEnabled": {
+			"name": "camel.component.aws-ecs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-ecs-kafka-connector/src/main/docs/camel-aws-ecs-kafka-sink-connector.adoc b/connectors/camel-aws-ecs-kafka-connector/src/main/docs/camel-aws-ecs-kafka-sink-connector.adoc
index 9a11441..3e6b4e7 100644
--- a/connectors/camel-aws-ecs-kafka-connector/src/main/docs/camel-aws-ecs-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-ecs-kafka-connector/src/main/docs/camel-aws-ecs-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsecs.CamelAwsecsSinkConnector
 ----
 
 
-The camel-aws-ecs sink connector supports 25 options, which are listed below.
+The camel-aws-ecs sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-ecs sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which ECS client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-ecs.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-ecs.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-ecs sink connector supports 25 options, which are listed below.
 | *camel.component.aws-ecs.proxyProtocol* | To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-ecs.region* | The region in which ECS client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-ecs.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-ecs.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-ecs.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnectorConfig.java b/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnectorConfig.java
index 09ee749..b4e0b07 100644
--- a/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnectorConfig.java
+++ b/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwsecsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSECS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSECS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSECS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSECS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwsecsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-ecs.secretKey";
     public static final String CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-ecs.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSECS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSECS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-ecs.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSECS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSECS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwsecsSinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwsecsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSECS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSECS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSECS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSECS_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSECS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwsecsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSECS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSECS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSECS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSECS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSECS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-eks-kafka-connector/src/generated/resources/camel-aws-eks-sink.json b/connectors/camel-aws-eks-kafka-connector/src/generated/resources/camel-aws-eks-sink.json
index e75535d..13c143a 100644
--- a/connectors/camel-aws-eks-kafka-connector/src/generated/resources/camel-aws-eks-sink.json
+++ b/connectors/camel-aws-eks-kafka-connector/src/generated/resources/camel-aws-eks-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-eks.basicPropertyBinding": {
-			"name": "camel.component.aws-eks.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-eks.autowiredEnabled": {
+			"name": "camel.component.aws-eks.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-eks-kafka-connector/src/main/docs/camel-aws-eks-kafka-sink-connector.adoc b/connectors/camel-aws-eks-kafka-connector/src/main/docs/camel-aws-eks-kafka-sink-connector.adoc
index e8bf0be..edb22be 100644
--- a/connectors/camel-aws-eks-kafka-connector/src/main/docs/camel-aws-eks-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-eks-kafka-connector/src/main/docs/camel-aws-eks-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awseks.CamelAwseksSinkConnector
 ----
 
 
-The camel-aws-eks sink connector supports 25 options, which are listed below.
+The camel-aws-eks sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-eks sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which EKS client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-eks.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-eks.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-eks sink connector supports 25 options, which are listed below.
 | *camel.component.aws-eks.proxyProtocol* | To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-eks.region* | The region in which EKS client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-eks.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-eks.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-eks.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnectorConfig.java b/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnectorConfig.java
index 0a59481..f59fe3c 100644
--- a/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnectorConfig.java
+++ b/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwseksSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSEKS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSEKS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSEKS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSEKS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwseksSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-eks.secretKey";
     public static final String CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-eks.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSEKS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSEKS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-eks.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSEKS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSEKS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwseksSinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwseksSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSEKS_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSEKS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwseksSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSEKS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSEKS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSEKS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-iam-kafka-connector/src/generated/resources/camel-aws-iam-sink.json b/connectors/camel-aws-iam-kafka-connector/src/generated/resources/camel-aws-iam-sink.json
index 4e31313..5142ace 100644
--- a/connectors/camel-aws-iam-kafka-connector/src/generated/resources/camel-aws-iam-sink.json
+++ b/connectors/camel-aws-iam-kafka-connector/src/generated/resources/camel-aws-iam-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-iam.basicPropertyBinding": {
-			"name": "camel.component.aws-iam.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-iam.autowiredEnabled": {
+			"name": "camel.component.aws-iam.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-iam-kafka-connector/src/main/docs/camel-aws-iam-kafka-sink-connector.adoc b/connectors/camel-aws-iam-kafka-connector/src/main/docs/camel-aws-iam-kafka-sink-connector.adoc
index 2f21206..3bec2dd 100644
--- a/connectors/camel-aws-iam-kafka-connector/src/main/docs/camel-aws-iam-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-iam-kafka-connector/src/main/docs/camel-aws-iam-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsiam.CamelAwsiamSinkConnector
 ----
 
 
-The camel-aws-iam sink connector supports 25 options, which are listed below.
+The camel-aws-iam sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-iam sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which IAM client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-iam.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-iam.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-iam sink connector supports 25 options, which are listed below.
 | *camel.component.aws-iam.proxyProtocol* | To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-iam.region* | The region in which IAM client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-iam.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-iam.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-iam.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnectorConfig.java b/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnectorConfig.java
index 725cb28..aba565f 100644
--- a/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnectorConfig.java
+++ b/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwsiamSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSIAM_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSIAM_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSIAM_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSIAM_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwsiamSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-iam.secretKey";
     public static final String CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-iam.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSIAM_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSIAM_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-iam.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSIAM_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSIAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwsiamSinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwsiamSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSIAM_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSIAM_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwsiamSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSIAM_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSIAM_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSIAM_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink.json b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink.json
index b6ca7a8..9f4cb23 100644
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink.json
+++ b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,11 +130,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kinesis-firehose.basicPropertyBinding": {
-			"name": "camel.component.aws-kinesis-firehose.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kinesis-firehose.autowiredEnabled": {
+			"name": "camel.component.aws-kinesis-firehose.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-kinesis-firehose.accessKey": {
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/camel-aws-kinesis-firehose-kafka-sink-connector.adoc b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/camel-aws-kinesis-firehose-kafka-sink-connector.adoc
index e378053..c6202d8 100644
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/camel-aws-kinesis-firehose-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/camel-aws-kinesis-firehose-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awskinesisfirehose.CamelAwskines
 ----
 
 
-The camel-aws-kinesis-firehose sink connector supports 23 options, which are listed below.
+The camel-aws-kinesis-firehose sink connector supports 22 options, which are listed below.
 
 
 
@@ -37,7 +37,6 @@ The camel-aws-kinesis-firehose sink connector supports 23 options, which are lis
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Kinesis Firehose client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the Kinesis Firehose client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which Kinesis client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -49,7 +48,7 @@ The camel-aws-kinesis-firehose sink connector supports 23 options, which are lis
 | *camel.component.aws-kinesis-firehose.proxyPort* | To define a proxy port when instantiating the Kinesis Firehose client | null | false | MEDIUM
 | *camel.component.aws-kinesis-firehose.proxyProtocol* | To define a proxy protocol when instantiating the Kinesis Firehose client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-kinesis-firehose.region* | The region in which Kinesis client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
-| *camel.component.aws-kinesis-firehose.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-kinesis-firehose.autowired Enabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-kinesis-firehose.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-kinesis-firehose.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnectorConfig.java b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnectorConfig.java
index f88b76c..aa4d40a 100644
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnectorConfig.java
+++ b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnectorConfig.java
@@ -50,9 +50,6 @@ public class CamelAwskinesisfirehoseSinkConnectorConfig
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_REGION_CONF = "camel.sink.endpoint.region";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_REGION_DOC = "The region in which Kinesis client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)You'll need to use the name Regions.EU_WEST_1.name()";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_REGION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -86,9 +83,9 @@ public class CamelAwskinesisfirehoseSinkConnectorConfig
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_REGION_CONF = "camel.component.aws-kinesis-firehose.region";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_REGION_DOC = "The region in which Kinesis client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)You'll need to use the name Regions.EU_WEST_1.name()";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_REGION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-kinesis-firehose.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-kinesis-firehose.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-kinesis-firehose.accessKey";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -117,7 +114,6 @@ public class CamelAwskinesisfirehoseSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_REGION_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SECRET_KEY_DOC);
@@ -129,7 +125,7 @@ public class CamelAwskinesisfirehoseSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_REGION_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-sink.json b/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-sink.json
index 15df906..48e1f19 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-sink.json
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,11 +130,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kinesis.basicPropertyBinding": {
-			"name": "camel.component.aws-kinesis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kinesis.autowiredEnabled": {
+			"name": "camel.component.aws-kinesis.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-kinesis.accessKey": {
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-source.json b/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-source.json
index 25b1050..2d6e9a0 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-source.json
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-source.json
@@ -118,13 +118,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -321,11 +314,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kinesis.basicPropertyBinding": {
-			"name": "camel.component.aws-kinesis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kinesis.autowiredEnabled": {
+			"name": "camel.component.aws-kinesis.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-kinesis.accessKey": {
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-sink-connector.adoc b/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-sink-connector.adoc
index eca3ca8..03ca760 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSinkCo
 ----
 
 
-The camel-aws-kinesis sink connector supports 23 options, which are listed below.
+The camel-aws-kinesis sink connector supports 22 options, which are listed below.
 
 
 
@@ -37,7 +37,6 @@ The camel-aws-kinesis sink connector supports 23 options, which are listed below
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the Kinesis client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which Kinesis client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -49,7 +48,7 @@ The camel-aws-kinesis sink connector supports 23 options, which are listed below
 | *camel.component.aws-kinesis.proxyProtocol* | To define a proxy protocol when instantiating the Kinesis client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-kinesis.region* | The region in which Kinesis client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-kinesis.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed  [...]
-| *camel.component.aws-kinesis.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-kinesis.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-kinesis.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-kinesis.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-source-connector.adoc b/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-source-connector.adoc
index 2b059d0..f6874df 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-source-connector.adoc
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSource
 ----
 
 
-The camel-aws-kinesis source connector supports 51 options, which are listed below.
+The camel-aws-kinesis source connector supports 50 options, which are listed below.
 
 
 
@@ -46,7 +46,6 @@ The camel-aws-kinesis source connector supports 51 options, which are listed bel
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.backoffErrorThreshold* | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
 | *camel.source.endpoint.backoffIdleThreshold* | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
@@ -77,7 +76,7 @@ The camel-aws-kinesis source connector supports 51 options, which are listed bel
 | *camel.component.aws-kinesis.sequenceNumber* | The sequence number to start polling from. Required if iteratorType is set to AFTER_SEQUENCE_NUMBER or AT_SEQUENCE_NUMBER | null | false | MEDIUM
 | *camel.component.aws-kinesis.shardClosed* | Define what will be the behavior in case of shard closed. Possible value are ignore, silent and fail. In case of ignore a message will be logged and the consumer will restart from the beginning,in case of silent there will be no logging and the consumer will start from the beginning,in case of fail a ReachedClosedStateException will be raised One of: [ignore] [fail] [silent] | "ignore" | false | MEDIUM
 | *camel.component.aws-kinesis.shardId* | Defines which shardId in the Kinesis stream to get records from | null | false | MEDIUM
-| *camel.component.aws-kinesis.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-kinesis.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-kinesis.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-kinesis.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnectorConfig.java b/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnectorConfig.java
index 5b003cb..f52910e 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnectorConfig.java
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnectorConfig.java
@@ -50,9 +50,6 @@ public class CamelAwskinesisSinkConnectorConfig
     public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that [...]
     public static final Boolean CAMEL_SINK_AWSKINESIS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -86,9 +83,9 @@ public class CamelAwskinesisSinkConnectorConfig
     public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws-kinesis.lazyStartProducer";
     public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware tha [...]
     public static final Boolean CAMEL_SINK_AWSKINESIS_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-kinesis.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-kinesis.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-kinesis.accessKey";
     public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -116,7 +113,6 @@ public class CamelAwskinesisSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_SECRET_KEY_DOC);
@@ -128,7 +124,7 @@ public class CamelAwskinesisSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnectorConfig.java b/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnectorConfig.java
index 2bc9dc1..a21e58f 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnectorConfig.java
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnectorConfig.java
@@ -77,9 +77,6 @@ public class CamelAwskinesisSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_POLL_STRATEGY_CONF = "camel.source.endpoint.pollStrategy";
     public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_POLL_STRATEGY_DOC = "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.";
     public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_POLL_STRATEGY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -170,9 +167,9 @@ public class CamelAwskinesisSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_ID_CONF = "camel.component.aws-kinesis.shardId";
     public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_ID_DOC = "Defines which shardId in the Kinesis stream to get records from";
     public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_ID_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-kinesis.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-kinesis.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-kinesis.accessKey";
     public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -209,7 +206,6 @@ public class CamelAwskinesisSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_POLL_STRATEGY_DOC);
-        conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC);
@@ -240,7 +236,7 @@ public class CamelAwskinesisSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_SEQUENCE_NUMBER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SEQUENCE_NUMBER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SEQUENCE_NUMBER_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_CLOSED_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_CLOSED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_CLOSED_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_ID_DOC);
-        conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-kms-kafka-connector/src/generated/resources/camel-aws-kms-sink.json b/connectors/camel-aws-kms-kafka-connector/src/generated/resources/camel-aws-kms-sink.json
index c9cd26c..221f341 100644
--- a/connectors/camel-aws-kms-kafka-connector/src/generated/resources/camel-aws-kms-sink.json
+++ b/connectors/camel-aws-kms-kafka-connector/src/generated/resources/camel-aws-kms-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kms.basicPropertyBinding": {
-			"name": "camel.component.aws-kms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kms.autowiredEnabled": {
+			"name": "camel.component.aws-kms.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-kms-kafka-connector/src/main/docs/camel-aws-kms-kafka-sink-connector.adoc b/connectors/camel-aws-kms-kafka-connector/src/main/docs/camel-aws-kms-kafka-sink-connector.adoc
index 623b201..097776c 100644
--- a/connectors/camel-aws-kms-kafka-connector/src/main/docs/camel-aws-kms-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-kms-kafka-connector/src/main/docs/camel-aws-kms-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awskms.CamelAwskmsSinkConnector
 ----
 
 
-The camel-aws-kms sink connector supports 25 options, which are listed below.
+The camel-aws-kms sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-kms sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the KMS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which KMS client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-kms.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-kms.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-kms sink connector supports 25 options, which are listed below.
 | *camel.component.aws-kms.proxyProtocol* | To define a proxy protocol when instantiating the KMS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-kms.region* | The region in which KMS client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-kms.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-kms.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-kms.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskms/CamelAwskmsSinkConnectorConfig.java b/connectors/camel-aws-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskms/CamelAwskmsSinkConnectorConfig.java
index dc007d8..bd1e49b 100644
--- a/connectors/camel-aws-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskms/CamelAwskmsSinkConnectorConfig.java
+++ b/connectors/camel-aws-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskms/CamelAwskmsSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwskmsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSKMS_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSKMS_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSKMS_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKMS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSKMS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSKMS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSKMS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSKMS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSKMS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwskmsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSKMS_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-kms.secretKey";
     public static final String CAMEL_SINK_AWSKMS_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSKMS_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKMS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-kms.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSKMS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSKMS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSKMS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-kms.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSKMS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSKMS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwskmsSinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwskmsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSKMS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSKMS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSKMS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSKMS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKMS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSKMS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKMS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSKMS_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKMS_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSKMS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwskmsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSKMS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSKMS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSKMS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSKMS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKMS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSKMS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSKMS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKMS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-sink.json b/connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-sink.json
index 7531787..6aa4ab4 100644
--- a/connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-sink.json
+++ b/connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -126,19 +119,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws-lambda.autowiredEnabled": {
+			"name": "camel.component.aws-lambda.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws-lambda.awsLambdaClient": {
 			"name": "camel.component.aws-lambda.awsLambdaClient",
 			"description": "To use a existing configured AwsLambdaClient as client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-lambda.basicPropertyBinding": {
-			"name": "camel.component.aws-lambda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
-			"required": "false"
-		},
 		"camel.component.aws-lambda.proxyHost": {
 			"name": "camel.component.aws-lambda.proxyHost",
 			"description": "To define a proxy host when instantiating the Lambda client",
diff --git a/connectors/camel-aws-lambda-kafka-connector/src/main/docs/camel-aws-lambda-kafka-sink-connector.adoc b/connectors/camel-aws-lambda-kafka-connector/src/main/docs/camel-aws-lambda-kafka-sink-connector.adoc
index cad5132..ffe83e4 100644
--- a/connectors/camel-aws-lambda-kafka-connector/src/main/docs/camel-aws-lambda-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-lambda-kafka-connector/src/main/docs/camel-aws-lambda-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awslambda.CamelAwslambdaSinkConn
 ----
 
 
-The camel-aws-lambda sink connector supports 25 options, which are listed below.
+The camel-aws-lambda sink connector supports 24 options, which are listed below.
 
 
 
@@ -35,7 +35,6 @@ The camel-aws-lambda sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.operation* | The operation to perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction One of: [listFunctions] [getFunction] [createAlias] [deleteAlias] [getAlias] [listAliases] [createFunction] [deleteFunction] [invokeFunction] [updateFunction] [createEventSourceMapping] [deleteEventSourceMapping] [listEventSourceMapping] [listTags] [tagResource] [untagResource] [publishVersion] [listVersions] | "invokeFunction" | false | MEDIUM
 | *camel.sink.endpoint.region* | Amazon AWS Region. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.awsLambdaClient* | To use a existing configured AwsLambdaClient as client | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Lambda client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Lambda client | null | false | MEDIUM
@@ -47,8 +46,8 @@ The camel-aws-lambda sink connector supports 25 options, which are listed below.
 | *camel.component.aws-lambda.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...]
 | *camel.component.aws-lambda.operation* | The operation to perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction One of: [listFunctions] [getFunction] [createAlias] [deleteAlias] [getAlias] [listAliases] [createFunction] [deleteFunction] [invokeFunction] [updateFunction] [createEventSourceMapping] [deleteEventSourceMapping] [listEventSourceMapping] [listTags] [tagResource] [untagResource] [publishVersion] [listVersions] | "invokeFunction" | fals [...]
 | *camel.component.aws-lambda.region* | Amazon AWS Region. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
+| *camel.component.aws-lambda.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-lambda.awsLambdaClient* | To use a existing configured AwsLambdaClient as client | null | false | MEDIUM
-| *camel.component.aws-lambda.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
 | *camel.component.aws-lambda.proxyHost* | To define a proxy host when instantiating the Lambda client | null | false | MEDIUM
 | *camel.component.aws-lambda.proxyPort* | To define a proxy port when instantiating the Lambda client | null | false | MEDIUM
 | *camel.component.aws-lambda.proxyProtocol* | To define a proxy protocol when instantiating the Lambda client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
diff --git a/connectors/camel-aws-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambda/CamelAwslambdaSinkConnectorConfig.java b/connectors/camel-aws-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambda/CamelAwslambdaSinkConnectorConfig.java
index 820e9b3..858e863 100644
--- a/connectors/camel-aws-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambda/CamelAwslambdaSinkConnectorConfig.java
+++ b/connectors/camel-aws-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambda/CamelAwslambdaSinkConnectorConfig.java
@@ -44,9 +44,6 @@ public class CamelAwslambdaSinkConnectorConfig
     public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_CONF = "camel.sink.endpoint.awsLambdaClient";
     public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DOC = "To use a existing configured AwsLambdaClient as client";
     public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSLAMBDA_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSLAMBDA_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -80,12 +77,12 @@ public class CamelAwslambdaSinkConnectorConfig
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_REGION_CONF = "camel.component.aws-lambda.region";
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_REGION_DOC = "Amazon AWS Region. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name()";
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_REGION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-lambda.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSLAMBDA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_CONF = "camel.component.aws-lambda.awsLambdaClient";
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_DOC = "To use a existing configured AwsLambdaClient as client";
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-lambda.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSLAMBDA_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_HOST_CONF = "camel.component.aws-lambda.proxyHost";
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the Lambda client";
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_HOST_DEFAULT = null;
@@ -120,7 +117,6 @@ public class CamelAwslambdaSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_OPERATION_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSLAMBDA_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSLAMBDA_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_PROXY_PORT_DOC);
@@ -132,8 +128,8 @@ public class CamelAwslambdaSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSLAMBDA_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_OPERATION_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_REGION_DOC);
+        conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSLAMBDA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSLAMBDA_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSLAMBDA_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_PROTOCOL_DOC);
diff --git a/connectors/camel-aws-mq-kafka-connector/src/generated/resources/camel-aws-mq-sink.json b/connectors/camel-aws-mq-kafka-connector/src/generated/resources/camel-aws-mq-sink.json
index 4791c5a..e800afa 100644
--- a/connectors/camel-aws-mq-kafka-connector/src/generated/resources/camel-aws-mq-sink.json
+++ b/connectors/camel-aws-mq-kafka-connector/src/generated/resources/camel-aws-mq-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-mq.basicPropertyBinding": {
-			"name": "camel.component.aws-mq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-mq.autowiredEnabled": {
+			"name": "camel.component.aws-mq.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-mq-kafka-connector/src/main/docs/camel-aws-mq-kafka-sink-connector.adoc b/connectors/camel-aws-mq-kafka-connector/src/main/docs/camel-aws-mq-kafka-sink-connector.adoc
index 9e05c60..ad39f99 100644
--- a/connectors/camel-aws-mq-kafka-connector/src/main/docs/camel-aws-mq-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-mq-kafka-connector/src/main/docs/camel-aws-mq-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsmq.CamelAwsmqSinkConnector
 ----
 
 
-The camel-aws-mq sink connector supports 25 options, which are listed below.
+The camel-aws-mq sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-mq sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the MQ client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which MQ client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-mq.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-mq.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-mq sink connector supports 25 options, which are listed below.
 | *camel.component.aws-mq.proxyProtocol* | To define a proxy protocol when instantiating the MQ client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-mq.region* | The region in which MQ client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-mq.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-mq.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-mq.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmq/CamelAwsmqSinkConnectorConfig.java b/connectors/camel-aws-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmq/CamelAwsmqSinkConnectorConfig.java
index 6aefaa1..14f1e22 100644
--- a/connectors/camel-aws-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmq/CamelAwsmqSinkConnectorConfig.java
+++ b/connectors/camel-aws-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmq/CamelAwsmqSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwsmqSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSMQ_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSMQ_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSMQ_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSMQ_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSMQ_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSMQ_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSMQ_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwsmqSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSMQ_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-mq.secretKey";
     public static final String CAMEL_SINK_AWSMQ_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSMQ_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSMQ_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-mq.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSMQ_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSMQ_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSMQ_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-mq.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSMQ_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwsmqSinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwsmqSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSMQ_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSMQ_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSMQ_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSMQ_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSMQ_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMQ_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSMQ_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMQ_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSMQ_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwsmqSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSMQ_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSMQ_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSMQ_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSMQ_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMQ_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSMQ_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSMQ_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-msk-kafka-connector/src/generated/resources/camel-aws-msk-sink.json b/connectors/camel-aws-msk-kafka-connector/src/generated/resources/camel-aws-msk-sink.json
index b82d2de..be4d8c2 100644
--- a/connectors/camel-aws-msk-kafka-connector/src/generated/resources/camel-aws-msk-sink.json
+++ b/connectors/camel-aws-msk-kafka-connector/src/generated/resources/camel-aws-msk-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-msk.basicPropertyBinding": {
-			"name": "camel.component.aws-msk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-msk.autowiredEnabled": {
+			"name": "camel.component.aws-msk.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-msk-kafka-connector/src/main/docs/camel-aws-msk-kafka-sink-connector.adoc b/connectors/camel-aws-msk-kafka-connector/src/main/docs/camel-aws-msk-kafka-sink-connector.adoc
index ab3a76d..fd80b8b 100644
--- a/connectors/camel-aws-msk-kafka-connector/src/main/docs/camel-aws-msk-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-msk-kafka-connector/src/main/docs/camel-aws-msk-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsmsk.CamelAwsmskSinkConnector
 ----
 
 
-The camel-aws-msk sink connector supports 25 options, which are listed below.
+The camel-aws-msk sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-msk sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the MSK client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which MSK client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-msk.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-msk.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-msk sink connector supports 25 options, which are listed below.
 | *camel.component.aws-msk.proxyProtocol* | To define a proxy protocol when instantiating the MSK client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-msk.region* | The region in which MSK client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-msk.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-msk.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-msk.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmsk/CamelAwsmskSinkConnectorConfig.java b/connectors/camel-aws-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmsk/CamelAwsmskSinkConnectorConfig.java
index 8b805b0..b20f9ad 100644
--- a/connectors/camel-aws-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmsk/CamelAwsmskSinkConnectorConfig.java
+++ b/connectors/camel-aws-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmsk/CamelAwsmskSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwsmskSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSMSK_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSMSK_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSMSK_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSMSK_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSMSK_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSMSK_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSMSK_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSMSK_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSMSK_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwsmskSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSMSK_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-msk.secretKey";
     public static final String CAMEL_SINK_AWSMSK_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSMSK_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSMSK_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-msk.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSMSK_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSMSK_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSMSK_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-msk.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSMSK_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSMSK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwsmskSinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwsmskSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSMSK_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSMSK_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSMSK_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSMSK_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMSK_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSMSK_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMSK_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSMSK_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMSK_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSMSK_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwsmskSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSMSK_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSMSK_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSMSK_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSMSK_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMSK_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSMSK_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSMSK_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMSK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-sink.json b/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-sink.json
index e4dcdbf..493c281 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-sink.json
+++ b/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-sink.json
@@ -199,13 +199,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -415,11 +408,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-s3.basicPropertyBinding": {
-			"name": "camel.component.aws-s3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-s3.autowiredEnabled": {
+			"name": "camel.component.aws-s3.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-s3.accessKey": {
diff --git a/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-source.json b/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-source.json
index 7a17688..4fb886c 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-source.json
+++ b/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-source.json
@@ -219,13 +219,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -509,11 +502,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-s3.basicPropertyBinding": {
-			"name": "camel.component.aws-s3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-s3.autowiredEnabled": {
+			"name": "camel.component.aws-s3.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-s3.accessKey": {
diff --git a/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-sink-connector.adoc b/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-sink-connector.adoc
index 946275d..3ccb096 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awss3.CamelAwss3SinkConnector
 ----
 
 
-The camel-aws-s3 sink connector supports 65 options, which are listed below.
+The camel-aws-s3 sink connector supports 64 options, which are listed below.
 
 
 
@@ -58,7 +58,6 @@ The camel-aws-s3 sink connector supports 65 options, which are listed below.
 | *camel.sink.endpoint.dualstackEnabled* | Define if Dualstack enabled is true or false | false | false | MEDIUM
 | *camel.sink.endpoint.forceGlobalBucketAccessEnabled* | Define if Force Global Bucket Access enabled is true or false | false | false | MEDIUM
 | *camel.sink.endpoint.payloadSigningEnabled* | Define if Payload Signing enabled is true or false | false | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -91,7 +90,7 @@ The camel-aws-s3 sink connector supports 65 options, which are listed below.
 | *camel.component.aws-s3.dualstackEnabled* | Define if Dualstack enabled is true or false | false | false | MEDIUM
 | *camel.component.aws-s3.forceGlobalBucketAccess Enabled* | Define if Force Global Bucket Access enabled is true or false | false | false | MEDIUM
 | *camel.component.aws-s3.payloadSigningEnabled* | Define if Payload Signing enabled is true or false | false | false | MEDIUM
-| *camel.component.aws-s3.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-s3.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-s3.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-s3.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-source-connector.adoc b/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-source-connector.adoc
index adfff28..10ddc3b 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-source-connector.adoc
+++ b/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awss3.CamelAwss3SourceConnector
 ----
 
 
-The camel-aws-s3 source connector supports 79 options, which are listed below.
+The camel-aws-s3 source connector supports 78 options, which are listed below.
 
 
 
@@ -61,7 +61,6 @@ The camel-aws-s3 source connector supports 79 options, which are listed below.
 | *camel.source.endpoint.dualstackEnabled* | Define if Dualstack enabled is true or false | false | false | MEDIUM
 | *camel.source.endpoint.forceGlobalBucketAccess Enabled* | Define if Force Global Bucket Access enabled is true or false | false | false | MEDIUM
 | *camel.source.endpoint.payloadSigningEnabled* | Define if Payload Signing enabled is true or false | false | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.backoffErrorThreshold* | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
 | *camel.source.endpoint.backoffIdleThreshold* | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
@@ -105,7 +104,7 @@ The camel-aws-s3 source connector supports 79 options, which are listed below.
 | *camel.component.aws-s3.dualstackEnabled* | Define if Dualstack enabled is true or false | false | false | MEDIUM
 | *camel.component.aws-s3.forceGlobalBucketAccess Enabled* | Define if Force Global Bucket Access enabled is true or false | false | false | MEDIUM
 | *camel.component.aws-s3.payloadSigningEnabled* | Define if Payload Signing enabled is true or false | false | false | MEDIUM
-| *camel.component.aws-s3.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-s3.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-s3.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-s3.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SinkConnectorConfig.java b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SinkConnectorConfig.java
index 1e03f9b..c21ab98 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SinkConnectorConfig.java
+++ b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SinkConnectorConfig.java
@@ -111,9 +111,6 @@ public class CamelAwss3SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_CONF = "camel.sink.endpoint.payloadSigningEnabled";
     public static final String CAMEL_SINK_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DOC = "Define if Payload Signing enabled is true or false";
     public static final Boolean CAMEL_SINK_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSS3_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSS3_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSS3_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -210,9 +207,9 @@ public class CamelAwss3SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_CONF = "camel.component.aws-s3.payloadSigningEnabled";
     public static final String CAMEL_SINK_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DOC = "Define if Payload Signing enabled is true or false";
     public static final Boolean CAMEL_SINK_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-s3.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSS3_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-s3.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSS3_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-s3.accessKey";
     public static final String CAMEL_SINK_AWSS3_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSS3_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -261,7 +258,6 @@ public class CamelAwss3SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSS3_ENDPOINT_DUALSTACK_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_ENDPOINT_DUALSTACK_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_DUALSTACK_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSS3_ENDPOINT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_ENDPOINT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DOC);
-        conf.define(CAMEL_SINK_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSS3_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSS3_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSS3_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_SECRET_KEY_DOC);
@@ -294,7 +290,7 @@ public class CamelAwss3SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSS3_COMPONENT_DUALSTACK_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_COMPONENT_DUALSTACK_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_COMPONENT_DUALSTACK_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSS3_COMPONENT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_COMPONENT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_COMPONENT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DOC);
-        conf.define(CAMEL_SINK_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSS3_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSS3_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSS3_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SourceConnectorConfig.java b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SourceConnectorConfig.java
index b4c2041..5a42726 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SourceConnectorConfig.java
+++ b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SourceConnectorConfig.java
@@ -122,9 +122,6 @@ public class CamelAwss3SourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_CONF = "camel.source.endpoint.payloadSigningEnabled";
     public static final String CAMEL_SOURCE_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DOC = "Define if Payload Signing enabled is true or false";
     public static final Boolean CAMEL_SOURCE_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWSS3_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_AWSS3_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_AWSS3_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -254,9 +251,9 @@ public class CamelAwss3SourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_CONF = "camel.component.aws-s3.payloadSigningEnabled";
     public static final String CAMEL_SOURCE_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DOC = "Define if Payload Signing enabled is true or false";
     public static final Boolean CAMEL_SOURCE_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-s3.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSS3_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-s3.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWSS3_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-s3.accessKey";
     public static final String CAMEL_SOURCE_AWSS3_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SOURCE_AWSS3_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -308,7 +305,6 @@ public class CamelAwss3SourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_DUALSTACK_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_ENDPOINT_DUALSTACK_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_DUALSTACK_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_ENDPOINT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DOC);
-        conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_BACKOFF_ERROR_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSS3_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSS3_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC);
@@ -352,7 +348,7 @@ public class CamelAwss3SourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_DUALSTACK_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_COMPONENT_DUALSTACK_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_COMPONENT_DUALSTACK_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_COMPONENT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_COMPONENT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DOC);
-        conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSS3_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSS3_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-sink.json b/connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-sink.json
index 0e037a9..1fd578d 100644
--- a/connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-sink.json
+++ b/connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-sink.json
@@ -85,13 +85,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,11 +99,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sdb.basicPropertyBinding": {
-			"name": "camel.component.aws-sdb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sdb.autowiredEnabled": {
+			"name": "camel.component.aws-sdb.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-sdb-kafka-connector/src/main/docs/camel-aws-sdb-kafka-sink-connector.adoc b/connectors/camel-aws-sdb-kafka-connector/src/main/docs/camel-aws-sdb-kafka-sink-connector.adoc
index f50fad6..2b7c800 100644
--- a/connectors/camel-aws-sdb-kafka-connector/src/main/docs/camel-aws-sdb-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-sdb-kafka-connector/src/main/docs/camel-aws-sdb-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awssdb.CamelAwssdbSinkConnector
 ----
 
 
-The camel-aws-sdb sink connector supports 16 options, which are listed below.
+The camel-aws-sdb sink connector supports 15 options, which are listed below.
 
 
 
@@ -41,10 +41,9 @@ The camel-aws-sdb sink connector supports 16 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SDB client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which SDB client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-sdb.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...]
-| *camel.component.aws-sdb.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-sdb.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-sdb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssdb/CamelAwssdbSinkConnectorConfig.java b/connectors/camel-aws-sdb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssdb/CamelAwssdbSinkConnectorConfig.java
index 797784d..7f40308 100644
--- a/connectors/camel-aws-sdb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssdb/CamelAwssdbSinkConnectorConfig.java
+++ b/connectors/camel-aws-sdb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssdb/CamelAwssdbSinkConnectorConfig.java
@@ -60,18 +60,15 @@ public class CamelAwssdbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSDB_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSSDB_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSSDB_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSDB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSDB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSDB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSDB_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSSDB_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSSDB_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSDB_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws-sdb.lazyStartProducer";
     public static final String CAMEL_SINK_AWSSDB_COMPONENT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that wh [...]
     public static final Boolean CAMEL_SINK_AWSSDB_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSSDB_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-sdb.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSDB_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSDB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSDB_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-sdb.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSSDB_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSSDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwssdbSinkConnectorConfig(
             ConfigDef config,
@@ -97,10 +94,9 @@ public class CamelAwssdbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSDB_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSDB_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSSDB_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSDB_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSSDB_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSDB_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSSDB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSDB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSSDB_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSDB_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSSDB_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSDB_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSSDB_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSDB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSSDB_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSSDB_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-sink.json b/connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-sink.json
index 019edf5..e3e50c0 100644
--- a/connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-sink.json
+++ b/connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -185,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ses.basicPropertyBinding": {
-			"name": "camel.component.aws-ses.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ses.autowiredEnabled": {
+			"name": "camel.component.aws-ses.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-ses.accessKey": {
diff --git a/connectors/camel-aws-ses-kafka-connector/src/main/docs/camel-aws-ses-kafka-sink-connector.adoc b/connectors/camel-aws-ses-kafka-connector/src/main/docs/camel-aws-ses-kafka-sink-connector.adoc
index ec6292d..8e804ed 100644
--- a/connectors/camel-aws-ses-kafka-connector/src/main/docs/camel-aws-ses-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-ses-kafka-connector/src/main/docs/camel-aws-ses-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsses.CamelAwssesSinkConnector
 ----
 
 
-The camel-aws-ses sink connector supports 31 options, which are listed below.
+The camel-aws-ses sink connector supports 30 options, which are listed below.
 
 
 
@@ -41,7 +41,6 @@ The camel-aws-ses sink connector supports 31 options, which are listed below.
 | *camel.sink.endpoint.returnPath* | The email address to which bounce notifications are to be forwarded, override it using 'CamelAwsSesReturnPath' header. | null | false | MEDIUM
 | *camel.sink.endpoint.subject* | The subject which is used if the message header 'CamelAwsSesSubject' is not present. | null | false | MEDIUM
 | *camel.sink.endpoint.to* | List of destination email address. Can be overriden with 'CamelAwsSesTo' header. | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -57,7 +56,7 @@ The camel-aws-ses sink connector supports 31 options, which are listed below.
 | *camel.component.aws-ses.returnPath* | The email address to which bounce notifications are to be forwarded, override it using 'CamelAwsSesReturnPath' header. | null | false | MEDIUM
 | *camel.component.aws-ses.subject* | The subject which is used if the message header 'CamelAwsSesSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws-ses.to* | List of destination email address. Can be overriden with 'CamelAwsSesTo' header. | null | false | MEDIUM
-| *camel.component.aws-ses.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-ses.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-ses.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-ses.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsses/CamelAwssesSinkConnectorConfig.java b/connectors/camel-aws-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsses/CamelAwssesSinkConnectorConfig.java
index 55fd3d0..fee1750 100644
--- a/connectors/camel-aws-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsses/CamelAwssesSinkConnectorConfig.java
+++ b/connectors/camel-aws-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsses/CamelAwssesSinkConnectorConfig.java
@@ -60,9 +60,6 @@ public class CamelAwssesSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSES_ENDPOINT_TO_CONF = "camel.sink.endpoint.to";
     public static final String CAMEL_SINK_AWSSES_ENDPOINT_TO_DOC = "List of destination email address. Can be overriden with 'CamelAwsSesTo' header.";
     public static final String CAMEL_SINK_AWSSES_ENDPOINT_TO_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSES_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSES_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSES_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSES_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSSES_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSSES_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -108,9 +105,9 @@ public class CamelAwssesSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSES_COMPONENT_TO_CONF = "camel.component.aws-ses.to";
     public static final String CAMEL_SINK_AWSSES_COMPONENT_TO_DOC = "List of destination email address. Can be overriden with 'CamelAwsSesTo' header.";
     public static final String CAMEL_SINK_AWSSES_COMPONENT_TO_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSES_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-ses.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSES_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSES_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSES_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-ses.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSSES_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSSES_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSSES_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-ses.accessKey";
     public static final String CAMEL_SINK_AWSSES_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSSES_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -142,7 +139,6 @@ public class CamelAwssesSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSES_ENDPOINT_RETURN_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_ENDPOINT_RETURN_PATH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_RETURN_PATH_DOC);
         conf.define(CAMEL_SINK_AWSSES_ENDPOINT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_ENDPOINT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWSSES_ENDPOINT_TO_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_ENDPOINT_TO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_TO_DOC);
-        conf.define(CAMEL_SINK_AWSSES_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSES_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSSES_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSES_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSSES_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSES_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_SECRET_KEY_DOC);
@@ -158,7 +154,7 @@ public class CamelAwssesSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSES_COMPONENT_RETURN_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_COMPONENT_RETURN_PATH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_COMPONENT_RETURN_PATH_DOC);
         conf.define(CAMEL_SINK_AWSSES_COMPONENT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_COMPONENT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_COMPONENT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWSSES_COMPONENT_TO_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_COMPONENT_TO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_COMPONENT_TO_DOC);
-        conf.define(CAMEL_SINK_AWSSES_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSES_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSSES_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSSES_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSES_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSSES_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSES_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-sink.json b/connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-sink.json
index ba2b1da..e28ce47 100644
--- a/connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-sink.json
+++ b/connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-sink.json
@@ -123,13 +123,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -257,11 +250,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sns.basicPropertyBinding": {
-			"name": "camel.component.aws-sns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sns.autowiredEnabled": {
+			"name": "camel.component.aws-sns.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-sns.accessKey": {
diff --git a/connectors/camel-aws-sns-kafka-connector/src/main/docs/camel-aws-sns-kafka-sink-connector.adoc b/connectors/camel-aws-sns-kafka-connector/src/main/docs/camel-aws-sns-kafka-sink-connector.adoc
index e169ecd..42e30eb 100644
--- a/connectors/camel-aws-sns-kafka-connector/src/main/docs/camel-aws-sns-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-sns-kafka-connector/src/main/docs/camel-aws-sns-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awssns.CamelAwssnsSinkConnector
 ----
 
 
-The camel-aws-sns sink connector supports 42 options, which are listed below.
+The camel-aws-sns sink connector supports 41 options, which are listed below.
 
 
 
@@ -47,7 +47,6 @@ The camel-aws-sns sink connector supports 42 options, which are listed below.
 | *camel.sink.endpoint.serverSideEncryptionEnabled* | Define if Server Side Encryption is enabled or not on the topic | false | false | MEDIUM
 | *camel.sink.endpoint.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.sink.endpoint.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -68,7 +67,7 @@ The camel-aws-sns sink connector supports 42 options, which are listed below.
 | *camel.component.aws-sns.serverSideEncryption Enabled* | Define if Server Side Encryption is enabled or not on the topic | false | false | MEDIUM
 | *camel.component.aws-sns.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws-sns.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
-| *camel.component.aws-sns.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-sns.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-sns.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-sns.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssns/CamelAwssnsSinkConnectorConfig.java b/connectors/camel-aws-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssns/CamelAwssnsSinkConnectorConfig.java
index 5c730a7..0aed8f9 100644
--- a/connectors/camel-aws-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssns/CamelAwssnsSinkConnectorConfig.java
+++ b/connectors/camel-aws-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssns/CamelAwssnsSinkConnectorConfig.java
@@ -78,9 +78,6 @@ public class CamelAwssnsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSCONF = "camel.sink.endpoint.subscribeSNStoSQS";
     public static final String CAMEL_SINK_AWSSNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDOC = "Define if the subscription between SNS Topic and SQS must be done or not";
     public static final Boolean CAMEL_SINK_AWSSNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDEFAULT = false;
-    public static final String CAMEL_SINK_AWSSNS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSNS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSNS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSNS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSSNS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSSNS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -141,9 +138,9 @@ public class CamelAwssnsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSNS_COMPONENT_SUBSCRIBE_SNSTO_SQSCONF = "camel.component.aws-sns.subscribeSNStoSQS";
     public static final String CAMEL_SINK_AWSSNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDOC = "Define if the subscription between SNS Topic and SQS must be done or not";
     public static final Boolean CAMEL_SINK_AWSSNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDEFAULT = false;
-    public static final String CAMEL_SINK_AWSSNS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-sns.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSNS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSNS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSNS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-sns.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSSNS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSSNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSSNS_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-sns.accessKey";
     public static final String CAMEL_SINK_AWSSNS_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSSNS_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -181,7 +178,6 @@ public class CamelAwssnsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_SERVER_SIDE_ENCRYPTION_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_ENDPOINT_SERVER_SIDE_ENCRYPTION_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_SERVER_SIDE_ENCRYPTION_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNS_ENDPOINT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSCONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDOC);
-        conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_SECRET_KEY_DOC);
@@ -202,7 +198,7 @@ public class CamelAwssnsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSNS_COMPONENT_SERVER_SIDE_ENCRYPTION_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_COMPONENT_SERVER_SIDE_ENCRYPTION_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_COMPONENT_SERVER_SIDE_ENCRYPTION_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSSNS_COMPONENT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNS_COMPONENT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_COMPONENT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWSSNS_COMPONENT_SUBSCRIBE_SNSTO_SQSCONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDOC);
-        conf.define(CAMEL_SINK_AWSSNS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSSNS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSSNS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSSNS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSNS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-sink.json b/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-sink.json
index e9e19a8..acaebde 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-sink.json
+++ b/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-sink.json
@@ -106,13 +106,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.delayQueue": {
 			"name": "camel.sink.endpoint.delayQueue",
 			"description": "Define if you want to apply delaySeconds option to the queue or on single messages",
@@ -278,11 +271,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sqs.basicPropertyBinding": {
-			"name": "camel.component.aws-sqs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sqs.autowiredEnabled": {
+			"name": "camel.component.aws-sqs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-sqs.delayQueue": {
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-source.json b/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-source.json
index 5ecb585..2aa2267 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-source.json
+++ b/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-source.json
@@ -189,13 +189,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.delayQueue": {
 			"name": "camel.source.endpoint.delayQueue",
 			"description": "Define if you want to apply delaySeconds option to the queue or on single messages",
@@ -506,11 +499,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sqs.basicPropertyBinding": {
-			"name": "camel.component.aws-sqs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sqs.autowiredEnabled": {
+			"name": "camel.component.aws-sqs.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-sqs.delayQueue": {
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-sink-connector.adoc b/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-sink-connector.adoc
index ab94e14..86c618c 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awssqs.CamelAwssqsSinkConnector
 ----
 
 
-The camel-aws-sqs sink connector supports 54 options, which are listed below.
+The camel-aws-sqs sink connector supports 53 options, which are listed below.
 
 
 
@@ -44,7 +44,6 @@ The camel-aws-sqs sink connector supports 54 options, which are listed below.
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
 | *camel.sink.endpoint.messageGroupIdStrategy* | Only for FIFO queues. Strategy for setting the messageGroupId on the message. Can be one of the following options: useConstant, useExchangeId, usePropertyValue. For the usePropertyValue option, the value of property CamelAwsMessageGroupId will be used. One of: [useConstant] [useExchangeId] [usePropertyValue] | null | false | MEDIUM
 | *camel.sink.endpoint.operation* | The operation to do in case the user don't want to send only a message One of: [sendBatchMessage] [deleteMessage] [listQueues] | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.delayQueue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | false | MEDIUM
 | *camel.sink.endpoint.queueUrl* | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. | null | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
@@ -71,7 +70,7 @@ The camel-aws-sqs sink connector supports 54 options, which are listed below.
 | *camel.component.aws-sqs.messageDeduplicationId Strategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
 | *camel.component.aws-sqs.messageGroupIdStrategy* | Only for FIFO queues. Strategy for setting the messageGroupId on the message. Can be one of the following options: useConstant, useExchangeId, usePropertyValue. For the usePropertyValue option, the value of property CamelAwsMessageGroupId will be used. One of: [useConstant] [useExchangeId] [usePropertyValue] | null | false | MEDIUM
 | *camel.component.aws-sqs.operation* | The operation to do in case the user don't want to send only a message One of: [sendBatchMessage] [deleteMessage] [listQueues] | null | false | MEDIUM
-| *camel.component.aws-sqs.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-sqs.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-sqs.delayQueue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | false | MEDIUM
 | *camel.component.aws-sqs.queueUrl* | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. | null | false | MEDIUM
 | *camel.component.aws-sqs.proxyHost* | To define a proxy host when instantiating the SQS client | null | false | MEDIUM
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-source-connector.adoc b/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-source-connector.adoc
index 7c4f43d..b4b2a8a 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-source-connector.adoc
+++ b/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awssqs.CamelAwssqsSourceConnecto
 ----
 
 
-The camel-aws-sqs source connector supports 89 options, which are listed below.
+The camel-aws-sqs source connector supports 88 options, which are listed below.
 
 
 
@@ -57,7 +57,6 @@ The camel-aws-sqs source connector supports 89 options, which are listed below.
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.delayQueue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | false | MEDIUM
 | *camel.source.endpoint.queueUrl* | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. | null | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
@@ -106,7 +105,7 @@ The camel-aws-sqs source connector supports 89 options, which are listed below.
 | *camel.component.aws-sqs.serverSideEncryption Enabled* | Define if Server Side Encryption is enabled or not on the queue | false | false | MEDIUM
 | *camel.component.aws-sqs.visibilityTimeout* | The duration (in seconds) that the received messages are hidden from subsequent retrieve requests after being retrieved by a ReceiveMessage request to set in the com.amazonaws.services.sqs.model.SetQueueAttributesRequest. This only make sense if its different from defaultVisibilityTimeout. It changes the queue visibility timeout attribute permanently. | null | false | MEDIUM
 | *camel.component.aws-sqs.waitTimeSeconds* | Duration in seconds (0 to 20) that the ReceiveMessage action call will wait until a message is in the queue to include in the response. | null | false | MEDIUM
-| *camel.component.aws-sqs.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-sqs.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-sqs.delayQueue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | false | MEDIUM
 | *camel.component.aws-sqs.queueUrl* | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. | null | false | MEDIUM
 | *camel.component.aws-sqs.proxyHost* | To define a proxy host when instantiating the SQS client | null | false | MEDIUM
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSinkConnectorConfig.java b/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSinkConnectorConfig.java
index 87c755d..cd73a4f 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSinkConnectorConfig.java
+++ b/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSinkConnectorConfig.java
@@ -69,9 +69,6 @@ public class CamelAwssqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSQS_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWSSQS_ENDPOINT_OPERATION_DOC = "The operation to do in case the user don't want to send only a message One of: [sendBatchMessage] [deleteMessage] [listQueues]";
     public static final String CAMEL_SINK_AWSSQS_ENDPOINT_OPERATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSQS_ENDPOINT_DELAY_QUEUE_CONF = "camel.sink.endpoint.delayQueue";
     public static final String CAMEL_SINK_AWSSQS_ENDPOINT_DELAY_QUEUE_DOC = "Define if you want to apply delaySeconds option to the queue or on single messages";
     public static final Boolean CAMEL_SINK_AWSSQS_ENDPOINT_DELAY_QUEUE_DEFAULT = false;
@@ -150,9 +147,9 @@ public class CamelAwssqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSQS_COMPONENT_OPERATION_CONF = "camel.component.aws-sqs.operation";
     public static final String CAMEL_SINK_AWSSQS_COMPONENT_OPERATION_DOC = "The operation to do in case the user don't want to send only a message One of: [sendBatchMessage] [deleteMessage] [listQueues]";
     public static final String CAMEL_SINK_AWSSQS_COMPONENT_OPERATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-sqs.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-sqs.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSSQS_COMPONENT_DELAY_QUEUE_CONF = "camel.component.aws-sqs.delayQueue";
     public static final String CAMEL_SINK_AWSSQS_COMPONENT_DELAY_QUEUE_DOC = "Define if you want to apply delaySeconds option to the queue or on single messages";
     public static final Boolean CAMEL_SINK_AWSSQS_COMPONENT_DELAY_QUEUE_DEFAULT = false;
@@ -214,7 +211,6 @@ public class CamelAwssqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_MESSAGE_GROUP_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_ENDPOINT_MESSAGE_GROUP_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_MESSAGE_GROUP_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_DELAY_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQS_ENDPOINT_DELAY_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_DELAY_QUEUE_DOC);
         conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_QUEUE_URL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_ENDPOINT_QUEUE_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_QUEUE_URL_DOC);
         conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_SYNCHRONOUS_DOC);
@@ -241,7 +237,7 @@ public class CamelAwssqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWSSQS_COMPONENT_MESSAGE_GROUP_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_COMPONENT_MESSAGE_GROUP_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_MESSAGE_GROUP_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWSSQS_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSSQS_COMPONENT_DELAY_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQS_COMPONENT_DELAY_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_DELAY_QUEUE_DOC);
         conf.define(CAMEL_SINK_AWSSQS_COMPONENT_QUEUE_URL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_COMPONENT_QUEUE_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_QUEUE_URL_DOC);
         conf.define(CAMEL_SINK_AWSSQS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_PROXY_HOST_DOC);
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSourceConnectorConfig.java b/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSourceConnectorConfig.java
index 10730e3..ef36752 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSourceConnectorConfig.java
+++ b/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSourceConnectorConfig.java
@@ -110,9 +110,6 @@ public class CamelAwssqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_POLL_STRATEGY_CONF = "camel.source.endpoint.pollStrategy";
     public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_POLL_STRATEGY_DOC = "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.";
     public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_POLL_STRATEGY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_DELAY_QUEUE_CONF = "camel.source.endpoint.delayQueue";
     public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_DELAY_QUEUE_DOC = "Define if you want to apply delaySeconds option to the queue or on single messages";
     public static final Boolean CAMEL_SOURCE_AWSSQS_ENDPOINT_DELAY_QUEUE_DEFAULT = false;
@@ -257,9 +254,9 @@ public class CamelAwssqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_WAIT_TIME_SECONDS_CONF = "camel.component.aws-sqs.waitTimeSeconds";
     public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_WAIT_TIME_SECONDS_DOC = "Duration in seconds (0 to 20) that the ReceiveMessage action call will wait until a message is in the queue to include in the response.";
     public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_WAIT_TIME_SECONDS_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-sqs.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-sqs.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_DELAY_QUEUE_CONF = "camel.component.aws-sqs.delayQueue";
     public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_DELAY_QUEUE_DOC = "Define if you want to apply delaySeconds option to the queue or on single messages";
     public static final Boolean CAMEL_SOURCE_AWSSQS_COMPONENT_DELAY_QUEUE_DEFAULT = false;
@@ -334,7 +331,6 @@ public class CamelAwssqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_POLL_STRATEGY_DOC);
-        conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_DELAY_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_ENDPOINT_DELAY_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_DELAY_QUEUE_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_QUEUE_URL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_ENDPOINT_QUEUE_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_QUEUE_URL_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_SYNCHRONOUS_DOC);
@@ -383,7 +379,7 @@ public class CamelAwssqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_SERVER_SIDE_ENCRYPTION_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_COMPONENT_SERVER_SIDE_ENCRYPTION_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_SERVER_SIDE_ENCRYPTION_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_VISIBILITY_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_COMPONENT_VISIBILITY_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_VISIBILITY_TIMEOUT_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_WAIT_TIME_SECONDS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_COMPONENT_WAIT_TIME_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_WAIT_TIME_SECONDS_DOC);
-        conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_DELAY_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_COMPONENT_DELAY_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_DELAY_QUEUE_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_QUEUE_URL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_COMPONENT_QUEUE_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_QUEUE_URL_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_PROXY_HOST_DOC);
diff --git a/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-sink.json b/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-sink.json
index 9787bf1..a29a544 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-sink.json
+++ b/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-sink.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientConfigurationParameters": {
 			"name": "camel.sink.endpoint.clientConfigurationParameters",
 			"description": "To configure the ClientConfiguration using the key\/values from the Map.",
@@ -214,11 +207,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-swf.basicPropertyBinding": {
-			"name": "camel.component.aws-swf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-swf.autowiredEnabled": {
+			"name": "camel.component.aws-swf.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-swf.clientConfigurationParameters": {
diff --git a/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-source.json b/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-source.json
index 96f1cea..6ae4000 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-source.json
+++ b/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.clientConfigurationParameters": {
 			"name": "camel.source.endpoint.clientConfigurationParameters",
 			"description": "To configure the ClientConfiguration using the key\/values from the Map.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-swf.basicPropertyBinding": {
-			"name": "camel.component.aws-swf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-swf.autowiredEnabled": {
+			"name": "camel.component.aws-swf.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-swf.clientConfigurationParameters": {
diff --git a/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-sink-connector.adoc b/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-sink-connector.adoc
index 0810db6..f2dd8d9 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsswf.CamelAwsswfSinkConnector
 ----
 
 
-The camel-aws-swf sink connector supports 47 options, which are listed below.
+The camel-aws-swf sink connector supports 46 options, which are listed below.
 
 
 
@@ -38,7 +38,6 @@ The camel-aws-swf sink connector supports 47 options, which are listed below.
 | *camel.sink.endpoint.version* | The workflow or activity event version to use. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.activitySchedulingOptions* | Activity scheduling options | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.clientConfigurationParameters* | To configure the ClientConfiguration using the key/values from the Map. | null | false | MEDIUM
 | *camel.sink.endpoint.startWorkflowOptionsParameters* | To configure the StartWorkflowOptions using the key/values from the Map. | null | false | MEDIUM
 | *camel.sink.endpoint.sWClientParameters* | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. | null | false | MEDIUM
@@ -62,7 +61,7 @@ The camel-aws-swf sink connector supports 47 options, which are listed below.
 | *camel.component.aws-swf.version* | The workflow or activity event version to use. | null | false | MEDIUM
 | *camel.component.aws-swf.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...]
 | *camel.component.aws-swf.activitySchedulingOptions* | Activity scheduling options | null | false | MEDIUM
-| *camel.component.aws-swf.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-swf.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-swf.clientConfiguration Parameters* | To configure the ClientConfiguration using the key/values from the Map. | null | false | MEDIUM
 | *camel.component.aws-swf.startWorkflowOptions Parameters* | To configure the StartWorkflowOptions using the key/values from the Map. | null | false | MEDIUM
 | *camel.component.aws-swf.sWClientParameters* | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. | null | false | MEDIUM
diff --git a/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-source-connector.adoc b/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-source-connector.adoc
index cd1a61a..38a017f 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-source-connector.adoc
+++ b/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsswf.CamelAwsswfSourceConnecto
 ----
 
 
-The camel-aws-swf source connector supports 43 options, which are listed below.
+The camel-aws-swf source connector supports 42 options, which are listed below.
 
 
 
@@ -43,7 +43,6 @@ The camel-aws-swf source connector supports 43 options, which are listed below.
 | *camel.source.endpoint.activityThreadPoolSize* | Maximum number of threads in work pool for activity. | 100 | false | MEDIUM
 | *camel.source.endpoint.activityTypeExecutionOptions* | Activity execution options | null | false | MEDIUM
 | *camel.source.endpoint.activityTypeRegistration Options* | Activity registration options | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.clientConfiguration Parameters* | To configure the ClientConfiguration using the key/values from the Map. | null | false | MEDIUM
 | *camel.source.endpoint.startWorkflowOptions Parameters* | To configure the StartWorkflowOptions using the key/values from the Map. | null | false | MEDIUM
 | *camel.source.endpoint.sWClientParameters* | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. | null | false | MEDIUM
@@ -64,7 +63,7 @@ The camel-aws-swf source connector supports 43 options, which are listed below.
 | *camel.component.aws-swf.activityThreadPoolSize* | Maximum number of threads in work pool for activity. | 100 | false | MEDIUM
 | *camel.component.aws-swf.activityTypeExecution Options* | Activity execution options | null | false | MEDIUM
 | *camel.component.aws-swf.activityTypeRegistration Options* | Activity registration options | null | false | MEDIUM
-| *camel.component.aws-swf.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-swf.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-swf.clientConfiguration Parameters* | To configure the ClientConfiguration using the key/values from the Map. | null | false | MEDIUM
 | *camel.component.aws-swf.startWorkflowOptions Parameters* | To configure the StartWorkflowOptions using the key/values from the Map. | null | false | MEDIUM
 | *camel.component.aws-swf.sWClientParameters* | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. | null | false | MEDIUM
diff --git a/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSinkConnectorConfig.java b/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSinkConnectorConfig.java
index 811d654..1c017cf 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSinkConnectorConfig.java
+++ b/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSinkConnectorConfig.java
@@ -51,9 +51,6 @@ public class CamelAwsswfSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSWF_ENDPOINT_ACTIVITY_SCHEDULING_OPTIONS_CONF = "camel.sink.endpoint.activitySchedulingOptions";
     public static final String CAMEL_SINK_AWSSWF_ENDPOINT_ACTIVITY_SCHEDULING_OPTIONS_DOC = "Activity scheduling options";
     public static final String CAMEL_SINK_AWSSWF_ENDPOINT_ACTIVITY_SCHEDULING_OPTIONS_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_CONF = "camel.sink.endpoint.clientConfigurationParameters";
     public static final String CAMEL_SINK_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DOC = "To configure the ClientConfiguration using the key/values from the Map.";
     public static final String CAMEL_SINK_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT = null;
@@ -123,9 +120,9 @@ public class CamelAwsswfSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSWF_COMPONENT_ACTIVITY_SCHEDULING_OPTIONS_CONF = "camel.component.aws-swf.activitySchedulingOptions";
     public static final String CAMEL_SINK_AWSSWF_COMPONENT_ACTIVITY_SCHEDULING_OPTIONS_DOC = "Activity scheduling options";
     public static final String CAMEL_SINK_AWSSWF_COMPONENT_ACTIVITY_SCHEDULING_OPTIONS_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-swf.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-swf.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_CONF = "camel.component.aws-swf.clientConfigurationParameters";
     public static final String CAMEL_SINK_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DOC = "To configure the ClientConfiguration using the key/values from the Map.";
     public static final String CAMEL_SINK_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT = null;
@@ -187,7 +184,6 @@ public class CamelAwsswfSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_ENDPOINT_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_VERSION_DOC);
         conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSWF_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_ACTIVITY_SCHEDULING_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_ENDPOINT_ACTIVITY_SCHEDULING_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_ACTIVITY_SCHEDULING_OPTIONS_DOC);
-        conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_START_WORKFLOW_OPTIONS_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_ENDPOINT_START_WORKFLOW_OPTIONS_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_START_WORKFLOW_OPTIONS_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_SWCLIENT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_ENDPOINT_SWCLIENT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_SWCLIENT_PARAMETERS_DOC);
@@ -211,7 +207,7 @@ public class CamelAwsswfSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSWF_COMPONENT_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_COMPONENT_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_VERSION_DOC);
         conf.define(CAMEL_SINK_AWSSWF_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSWF_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWSSWF_COMPONENT_ACTIVITY_SCHEDULING_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_COMPONENT_ACTIVITY_SCHEDULING_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_ACTIVITY_SCHEDULING_OPTIONS_DOC);
-        conf.define(CAMEL_SINK_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AWSSWF_COMPONENT_START_WORKFLOW_OPTIONS_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_COMPONENT_START_WORKFLOW_OPTIONS_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_START_WORKFLOW_OPTIONS_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AWSSWF_COMPONENT_SWCLIENT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_COMPONENT_SWCLIENT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_SWCLIENT_PARAMETERS_DOC);
diff --git a/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSourceConnectorConfig.java b/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSourceConnectorConfig.java
index abe5ec0..1bb784b 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSourceConnectorConfig.java
+++ b/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSourceConnectorConfig.java
@@ -68,9 +68,6 @@ public class CamelAwsswfSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_CONF = "camel.source.endpoint.activityTypeRegistrationOptions";
     public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DOC = "Activity registration options";
     public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_CONF = "camel.source.endpoint.clientConfigurationParameters";
     public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DOC = "To configure the ClientConfiguration using the key/values from the Map.";
     public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT = null;
@@ -131,9 +128,9 @@ public class CamelAwsswfSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_CONF = "camel.component.aws-swf.activityTypeRegistrationOptions";
     public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DOC = "Activity registration options";
     public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-swf.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-swf.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_CONF = "camel.component.aws-swf.clientConfigurationParameters";
     public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DOC = "To configure the ClientConfiguration using the key/values from the Map.";
     public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT = null;
@@ -182,7 +179,6 @@ public class CamelAwsswfSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_THREAD_POOL_SIZE_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_THREAD_POOL_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_THREAD_POOL_SIZE_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_EXECUTION_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_EXECUTION_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_EXECUTION_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DOC);
-        conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_START_WORKFLOW_OPTIONS_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_ENDPOINT_START_WORKFLOW_OPTIONS_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_START_WORKFLOW_OPTIONS_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_SWCLIENT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_ENDPOINT_SWCLIENT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_SWCLIENT_PARAMETERS_DOC);
@@ -203,7 +199,7 @@ public class CamelAwsswfSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_THREAD_POOL_SIZE_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_THREAD_POOL_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_THREAD_POOL_SIZE_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_EXECUTION_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_EXECUTION_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_EXECUTION_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DOC);
-        conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_START_WORKFLOW_OPTIONS_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_COMPONENT_START_WORKFLOW_OPTIONS_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_START_WORKFLOW_OPTIONS_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_SWCLIENT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_COMPONENT_SWCLIENT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_SWCLIENT_PARAMETERS_DOC);
diff --git a/connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-sink.json b/connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-sink.json
index 7f4e66b..6bac73f 100644
--- a/connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-sink.json
+++ b/connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-sink.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -201,11 +194,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-translate.basicPropertyBinding": {
-			"name": "camel.component.aws-translate.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-translate.autowiredEnabled": {
+			"name": "camel.component.aws-translate.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-translate-kafka-connector/src/main/docs/camel-aws-translate-kafka-sink-connector.adoc b/connectors/camel-aws-translate-kafka-connector/src/main/docs/camel-aws-translate-kafka-sink-connector.adoc
index 1fd89fe..3a09bc9 100644
--- a/connectors/camel-aws-translate-kafka-connector/src/main/docs/camel-aws-translate-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-translate-kafka-connector/src/main/docs/camel-aws-translate-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awstranslate.CamelAwstranslateSi
 ----
 
 
-The camel-aws-translate sink connector supports 31 options, which are listed below.
+The camel-aws-translate sink connector supports 30 options, which are listed below.
 
 
 
@@ -43,7 +43,6 @@ The camel-aws-translate sink connector supports 31 options, which are listed bel
 | *camel.sink.endpoint.sourceLanguage* | Source language to use | null | false | MEDIUM
 | *camel.sink.endpoint.targetLanguage* | Target language to use | null | false | MEDIUM
 | *camel.sink.endpoint.translateClient* | To use a existing configured AWS Translate as client | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-translate.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-translate.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -59,7 +58,7 @@ The camel-aws-translate sink connector supports 31 options, which are listed bel
 | *camel.component.aws-translate.sourceLanguage* | Source language to use | null | false | MEDIUM
 | *camel.component.aws-translate.targetLanguage* | Target language to use | null | false | MEDIUM
 | *camel.component.aws-translate.translateClient* | To use a existing configured AWS Translate as client | null | false | MEDIUM
-| *camel.component.aws-translate.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-translate.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstranslate/CamelAwstranslateSinkConnectorConfig.java b/connectors/camel-aws-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstranslate/CamelAwstranslateSinkConnectorConfig.java
index 6f1f60f..4e75fad 100644
--- a/connectors/camel-aws-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstranslate/CamelAwstranslateSinkConnectorConfig.java
+++ b/connectors/camel-aws-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstranslate/CamelAwstranslateSinkConnectorConfig.java
@@ -68,9 +68,6 @@ public class CamelAwstranslateSinkConnectorConfig
     public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TRANSLATE_CLIENT_CONF = "camel.sink.endpoint.translateClient";
     public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TRANSLATE_CLIENT_DOC = "To use a existing configured AWS Translate as client";
     public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TRANSLATE_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSTRANSLATE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -116,9 +113,9 @@ public class CamelAwstranslateSinkConnectorConfig
     public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_TRANSLATE_CLIENT_CONF = "camel.component.aws-translate.translateClient";
     public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_TRANSLATE_CLIENT_DOC = "To use a existing configured AWS Translate as client";
     public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_TRANSLATE_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-translate.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSTRANSLATE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-translate.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwstranslateSinkConnectorConfig(
             ConfigDef config,
@@ -146,7 +143,6 @@ public class CamelAwstranslateSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SOURCE_LANGUAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SOURCE_LANGUAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SOURCE_LANGUAGE_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TARGET_LANGUAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TARGET_LANGUAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TARGET_LANGUAGE_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TRANSLATE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TRANSLATE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TRANSLATE_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSTRANSLATE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_COMPONENT_ACCESS_KEY_DOC);
@@ -162,7 +158,7 @@ public class CamelAwstranslateSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_SOURCE_LANGUAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_COMPONENT_SOURCE_LANGUAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_COMPONENT_SOURCE_LANGUAGE_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_TARGET_LANGUAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_COMPONENT_TARGET_LANGUAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_COMPONENT_TARGET_LANGUAGE_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_TRANSLATE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_COMPONENT_TRANSLATE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_COMPONENT_TRANSLATE_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSTRANSLATE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSTRANSLATE_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws2-athena-kafka-connector/src/generated/resources/camel-aws2-athena-sink.json b/connectors/camel-aws2-athena-kafka-connector/src/generated/resources/camel-aws2-athena-sink.json
index a1e1013..b6315b8 100644
--- a/connectors/camel-aws2-athena-kafka-connector/src/generated/resources/camel-aws2-athena-sink.json
+++ b/connectors/camel-aws2-athena-kafka-connector/src/generated/resources/camel-aws2-athena-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key.",
@@ -189,13 +182,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientRequestToken": {
 			"name": "camel.sink.endpoint.clientRequestToken",
 			"description": "A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this.",
@@ -221,13 +207,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-athena.autoDiscoverClient": {
-			"name": "camel.component.aws2-athena.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-athena.configuration": {
 			"name": "camel.component.aws2-athena.configuration",
 			"description": "The component configuration.",
@@ -389,11 +368,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-athena.basicPropertyBinding": {
-			"name": "camel.component.aws2-athena.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-athena.autowiredEnabled": {
+			"name": "camel.component.aws2-athena.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-athena.clientRequestToken": {
diff --git a/connectors/camel-aws2-athena-kafka-connector/src/main/docs/camel-aws2-athena-kafka-sink-connector.adoc b/connectors/camel-aws2-athena-kafka-connector/src/main/docs/camel-aws2-athena-kafka-sink-connector.adoc
index 052a7f2..17a4e3e 100644
--- a/connectors/camel-aws2-athena-kafka-connector/src/main/docs/camel-aws2-athena-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-athena-kafka-connector/src/main/docs/camel-aws2-athena-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2athena.CamelAws2athenaSinkCo
 ----
 
 
-The camel-aws2-athena sink connector supports 61 options, which are listed below.
+The camel-aws2-athena sink connector supports 58 options, which are listed below.
 
 
 
@@ -30,7 +30,6 @@ The camel-aws2-athena sink connector supports 61 options, which are listed below
 |===
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.label* | Logical name | null | true | HIGH
-| *camel.sink.endpoint.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key. | null | false | MEDIUM
 | *camel.sink.endpoint.amazonAthenaClient* | The AmazonAthena instance to use as the client. | null | false | MEDIUM
 | *camel.sink.endpoint.database* | The Athena database to use. | null | false | MEDIUM
@@ -57,12 +56,10 @@ The camel-aws2-athena sink connector supports 61 options, which are listed below
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key. | null | false | MEDIUM
 | *camel.sink.endpoint.waitTimeout* | Optional max wait time in millis to wait for a successful query completion. See the section 'Waiting for Query Completion and Retrying Failed Queries' to learn more. | 0L | false | MEDIUM
 | *camel.sink.endpoint.workGroup* | The workgroup to use for running the query. | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.clientRequestToken* | A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this. | null | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws2-athena.accessKey* | Amazon AWS Access Key. | null | false | MEDIUM
 | *camel.component.aws2-athena.amazonAthenaClient* | The AmazonAthena instance to use as the client. | null | false | MEDIUM
-| *camel.component.aws2-athena.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | false | MEDIUM
 | *camel.component.aws2-athena.configuration* | The component configuration. | null | false | MEDIUM
 | *camel.component.aws2-athena.database* | The Athena database to use. | null | false | MEDIUM
 | *camel.component.aws2-athena.delay* | Milliseconds before the next poll for query execution status. See the section 'Waiting for Query Completion and Retrying Failed Queries' to learn more. | 2000L | false | MEDIUM
@@ -88,7 +85,7 @@ The camel-aws2-athena sink connector supports 61 options, which are listed below
 | *camel.component.aws2-athena.secretKey* | Amazon AWS Secret Key. | null | false | MEDIUM
 | *camel.component.aws2-athena.waitTimeout* | Optional max wait time in millis to wait for a successful query completion. See the section 'Waiting for Query Completion and Retrying Failed Queries' to learn more. | 0L | false | MEDIUM
 | *camel.component.aws2-athena.workGroup* | The workgroup to use for running the query. | null | false | MEDIUM
-| *camel.component.aws2-athena.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws2-athena.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-athena.clientRequestToken* | A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this. | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-aws2-athena-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2athena/CamelAws2athenaSinkConnectorConfig.java b/connectors/camel-aws2-athena-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2athena/CamelAws2athenaSinkConnectorConfig.java
index ee377cb..a25afff 100644
--- a/connectors/camel-aws2-athena-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2athena/CamelAws2athenaSinkConnectorConfig.java
+++ b/connectors/camel-aws2-athena-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2athena/CamelAws2athenaSinkConnectorConfig.java
@@ -29,9 +29,6 @@ public class CamelAws2athenaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2ATHENA_PATH_LABEL_CONF = "camel.sink.path.label";
     public static final String CAMEL_SINK_AWS2ATHENA_PATH_LABEL_DOC = "Logical name";
     public static final String CAMEL_SINK_AWS2ATHENA_PATH_LABEL_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC = "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking";
-    public static final Boolean CAMEL_SINK_AWS2ATHENA_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key.";
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -110,9 +107,6 @@ public class CamelAws2athenaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_WORK_GROUP_CONF = "camel.sink.endpoint.workGroup";
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_WORK_GROUP_DOC = "The workgroup to use for running the query.";
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_WORK_GROUP_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWS2ATHENA_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_CLIENT_REQUEST_TOKEN_CONF = "camel.sink.endpoint.clientRequestToken";
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_CLIENT_REQUEST_TOKEN_DOC = "A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this.";
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_CLIENT_REQUEST_TOKEN_DEFAULT = null;
@@ -125,9 +119,6 @@ public class CamelAws2athenaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AMAZON_ATHENA_CLIENT_CONF = "camel.component.aws2-athena.amazonAthenaClient";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AMAZON_ATHENA_CLIENT_DOC = "The AmazonAthena instance to use as the client.";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AMAZON_ATHENA_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws2-athena.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTO_DISCOVER_CLIENT_DOC = "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking";
-    public static final Boolean CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-athena.configuration";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_CONFIGURATION_DOC = "The component configuration.";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -203,9 +194,9 @@ public class CamelAws2athenaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_WORK_GROUP_CONF = "camel.component.aws2-athena.workGroup";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_WORK_GROUP_DOC = "The workgroup to use for running the query.";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_WORK_GROUP_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws2-athena.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWS2ATHENA_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-athena.autowiredEnabled";
+    public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_CLIENT_REQUEST_TOKEN_CONF = "camel.component.aws2-athena.clientRequestToken";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_CLIENT_REQUEST_TOKEN_DOC = "A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this.";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_CLIENT_REQUEST_TOKEN_DEFAULT = null;
@@ -223,7 +214,6 @@ public class CamelAws2athenaSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWS2ATHENA_PATH_LABEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_PATH_LABEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2ATHENA_PATH_LABEL_DOC);
-        conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ATHENA_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_AMAZON_ATHENA_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_ENDPOINT_AMAZON_ATHENA_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_AMAZON_ATHENA_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_DATABASE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_ENDPOINT_DATABASE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_DATABASE_DOC);
@@ -250,12 +240,10 @@ public class CamelAws2athenaSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_WAIT_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SINK_AWS2ATHENA_ENDPOINT_WAIT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_WAIT_TIMEOUT_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_WORK_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_ENDPOINT_WORK_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_WORK_GROUP_DOC);
-        conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ATHENA_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_CLIENT_REQUEST_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_ENDPOINT_CLIENT_REQUEST_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_CLIENT_REQUEST_TOKEN_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ATHENA_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_AMAZON_ATHENA_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_AMAZON_ATHENA_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_AMAZON_ATHENA_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_DATABASE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_DATABASE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_DATABASE_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_DELAY_CONF, ConfigDef.Type.LONG, CAMEL_SINK_AWS2ATHENA_COMPONENT_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_DELAY_DOC);
@@ -281,7 +269,7 @@ public class CamelAws2athenaSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_WAIT_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SINK_AWS2ATHENA_COMPONENT_WAIT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_WAIT_TIMEOUT_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_WORK_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_WORK_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_WORK_GROUP_DOC);
-        conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ATHENA_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWS2ATHENA_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_CLIENT_REQUEST_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_CLIENT_REQUEST_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_CLIENT_REQUEST_TOKEN_DOC);
         return conf;
     }
diff --git a/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-sink.json b/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-sink.json
index 656469a..10f93b9 100644
--- a/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-sink.json
+++ b/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -91,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -123,13 +109,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-cw.autoDiscoverClient": {
-			"name": "camel.component.aws2-cw.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-cw.configuration": {
 			"name": "camel.component.aws2-cw.configuration",
 			"description": "The component configuration",
@@ -199,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-cw.basicPropertyBinding": {
-			"name": "camel.component.aws2-cw.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-cw.autowiredEnabled": {
+			"name": "camel.component.aws2-cw.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-cw.accessKey": {
diff --git a/connectors/camel-aws2-cw-kafka-connector/src/main/docs/camel-aws2-cw-kafka-sink-connector.adoc b/connectors/camel-aws2-cw-kafka-connector/src/main/docs/camel-aws2-cw-kafka-sink-connector.adoc
index 21802c4..2857201 100644
--- a/connectors/camel-aws2-cw-kafka-connector/src/main/docs/camel-aws2-cw-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-cw-kafka-connector/src/main/docs/camel-aws2-cw-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2cw.CamelAws2cwSinkConnector
 ----
 
 
-The camel-aws2-cw sink connector supports 33 options, which are listed below.
+The camel-aws2-cw sink connector supports 30 options, which are listed below.
 
 
 
@@ -31,7 +31,6 @@ The camel-aws2-cw sink connector supports 33 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.namespace* | The metric namespace | null | true | HIGH
 | *camel.sink.endpoint.amazonCwClient* | To use the AmazonCloudWatch as the client | null | false | MEDIUM
-| *camel.sink.endpoint.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.name* | The metric name | null | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the CW client | null | false | MEDIUM
@@ -42,12 +41,10 @@ The camel-aws2-cw sink connector supports 33 options, which are listed below.
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.sink.endpoint.unit* | The metric unit | null | false | MEDIUM
 | *camel.sink.endpoint.value* | The metric value | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-cw.amazonCwClient* | To use the AmazonCloudWatch as the client | null | false | MEDIUM
-| *camel.component.aws2-cw.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws2-cw.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-cw.lazyStartProducer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...]
 | *camel.component.aws2-cw.name* | The metric name | null | false | MEDIUM
@@ -59,7 +56,7 @@ The camel-aws2-cw sink connector supports 33 options, which are listed below.
 | *camel.component.aws2-cw.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.component.aws2-cw.unit* | The metric unit | null | false | MEDIUM
 | *camel.component.aws2-cw.value* | The metric value | null | false | MEDIUM
-| *camel.component.aws2-cw.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws2-cw.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-cw.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-cw.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws2-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2cw/CamelAws2cwSinkConnectorConfig.java b/connectors/camel-aws2-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2cw/CamelAws2cwSinkConnectorConfig.java
index 97473ba..78e252e 100644
--- a/connectors/camel-aws2-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2cw/CamelAws2cwSinkConnectorConfig.java
+++ b/connectors/camel-aws2-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2cw/CamelAws2cwSinkConnectorConfig.java
@@ -30,9 +30,6 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_CONF = "camel.sink.endpoint.amazonCwClient";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_DOC = "To use the AmazonCloudWatch as the client";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC = "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.";
-    public static final Boolean CAMEL_SINK_AWS2CW_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_DOC = "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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that whe [...]
     public static final Boolean CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
@@ -63,9 +60,6 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_CONF = "camel.sink.endpoint.value";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_DOC = "The metric value";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWS2CW_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWS2CW_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -78,9 +72,6 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_AMAZON_CW_CLIENT_CONF = "camel.component.aws2-cw.amazonCwClient";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_AMAZON_CW_CLIENT_DOC = "To use the AmazonCloudWatch as the client";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_AMAZON_CW_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2CW_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws2-cw.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWS2CW_COMPONENT_AUTO_DISCOVER_CLIENT_DOC = "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.";
-    public static final Boolean CAMEL_SINK_AWS2CW_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-cw.configuration";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_DOC = "The component configuration";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -114,9 +105,9 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_VALUE_CONF = "camel.component.aws2-cw.value";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_VALUE_DOC = "The metric value";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_VALUE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2CW_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws2-cw.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWS2CW_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWS2CW_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-cw.autowiredEnabled";
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws2-cw.accessKey";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -138,7 +129,6 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWS2CW_PATH_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_PATH_NAMESPACE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2CW_PATH_NAMESPACE_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_NAME_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_DOC);
@@ -149,12 +139,10 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_DOC);
-        conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_AMAZON_CW_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_AMAZON_CW_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_AMAZON_CW_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWS2CW_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_NAME_DOC);
@@ -166,7 +154,7 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_UNIT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_VALUE_DOC);
-        conf.define(CAMEL_SINK_AWS2CW_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWS2CW_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-sink.json b/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-sink.json
index 062950f..237b751 100644
--- a/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-sink.json
+++ b/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.consistentRead": {
 			"name": "camel.sink.endpoint.consistentRead",
 			"description": "Determines whether or not strong consistency should be enforced when data is read.",
@@ -105,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,13 +123,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddb.autoDiscoverClient": {
-			"name": "camel.component.aws2-ddb.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ddb.configuration": {
 			"name": "camel.component.aws2-ddb.configuration",
 			"description": "The component configuration",
@@ -227,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddb.basicPropertyBinding": {
-			"name": "camel.component.aws2-ddb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ddb.autowiredEnabled": {
+			"name": "camel.component.aws2-ddb.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-ddb.accessKey": {
diff --git a/connectors/camel-aws2-ddb-kafka-connector/src/main/docs/camel-aws2-ddb-kafka-sink-connector.adoc b/connectors/camel-aws2-ddb-kafka-connector/src/main/docs/camel-aws2-ddb-kafka-sink-connector.adoc
index b83ad14..36635c0 100644
--- a/connectors/camel-aws2-ddb-kafka-connector/src/main/docs/camel-aws2-ddb-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-ddb-kafka-connector/src/main/docs/camel-aws2-ddb-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ddb.CamelAws2ddbSinkConnecto
 ----
 
 
-The camel-aws2-ddb sink connector supports 37 options, which are listed below.
+The camel-aws2-ddb sink connector supports 34 options, which are listed below.
 
 
 
@@ -31,7 +31,6 @@ The camel-aws2-ddb sink connector supports 37 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.tableName* | The name of the table currently worked with. | null | true | HIGH
 | *camel.sink.endpoint.amazonDDBClient* | To use the AmazonDynamoDB as the client | null | false | MEDIUM
-| *camel.sink.endpoint.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.sink.endpoint.consistentRead* | Determines whether or not strong consistency should be enforced when data is read. | false | false | MEDIUM
 | *camel.sink.endpoint.keyAttributeName* | Attribute name when creating table | null | false | MEDIUM
 | *camel.sink.endpoint.keyAttributeType* | Attribute type when creating table | null | false | MEDIUM
@@ -44,12 +43,10 @@ The camel-aws2-ddb sink connector supports 37 options, which are listed below.
 | *camel.sink.endpoint.region* | The region in which DDB client needs to work | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.sink.endpoint.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ddb.amazonDDBClient* | To use the AmazonDynamoDB as the client | null | false | MEDIUM
-| *camel.component.aws2-ddb.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws2-ddb.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-ddb.consistentRead* | Determines whether or not strong consistency should be enforced when data is read. | false | false | MEDIUM
 | *camel.component.aws2-ddb.keyAttributeName* | Attribute name when creating table | null | false | MEDIUM
@@ -63,7 +60,7 @@ The camel-aws2-ddb sink connector supports 37 options, which are listed below.
 | *camel.component.aws2-ddb.region* | The region in which DDB client needs to work | null | false | MEDIUM
 | *camel.component.aws2-ddb.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.component.aws2-ddb.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
-| *camel.component.aws2-ddb.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws2-ddb.autowiredEnabled* | 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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-ddb.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ddb.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws2-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddb/CamelAws2ddbSinkConnectorConfig.java b/connectors/camel-aws2-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddb/CamelAws2ddbSinkConnectorConfig.java
index 8ff9e6c..3ebe694 100644
--- a/connectors/camel-aws2-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddb/CamelAws2ddbSinkConnectorConfig.java
+++ b/connectors/camel-aws2-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddb/CamelAws2ddbSinkConnectorConfig.java
@@ -30,9 +30,6 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_AMAZON_DDBCLIENT_CONF = "camel.sink.endpoint.amazonDDBClient";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_AMAZON_DDBCLIENT_DOC = "To use the AmazonDynamoDB as the client";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_AMAZON_DDBCLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC = "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.";
-    public static final Boolean CAMEL_SINK_AWS2DDB_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_CONSISTENT_READ_CONF = "camel.sink.endpoint.consistentRead";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_CONSISTENT_READ_DOC = "Determines whether or not strong consistency should be enforced when data is read.";
     public static final Boolean CAMEL_SINK_AWS2DDB_ENDPOINT_CONSISTENT_READ_DEFAULT = false;
@@ -69,9 +66,6 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_CONF = "camel.sink.endpoint.writeCapacity";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_DOC = "The provisioned throughput to reserved for writing resources to your table";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWS2DDB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWS2DDB_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -84,9 +78,6 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AMAZON_DDBCLIENT_CONF = "camel.component.aws2-ddb.amazonDDBClient";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AMAZON_DDBCLIENT_DOC = "To use the AmazonDynamoDB as the client";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AMAZON_DDBCLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws2-ddb.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AUTO_DISCOVER_CLIENT_DOC = "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.";
-    public static final Boolean CAMEL_SINK_AWS2DDB_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-ddb.configuration";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_CONFIGURATION_DOC = "The component configuration";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -126,9 +117,9 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_CONF = "camel.component.aws2-ddb.writeCapacity";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_DOC = "The provisioned throughput to reserved for writing resources to your table";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws2-ddb.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWS2DDB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-ddb.autowiredEnabled";
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_DOC = "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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws2-ddb.accessKey";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -150,7 +141,6 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWS2DDB_PATH_TABLE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_PATH_TABLE_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2DDB_PATH_TABLE_NAME_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_AMAZON_DDBCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_AMAZON_DDBCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_AMAZON_DDBCLIENT_DOC);
-        conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_CONSISTENT_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_CONSISTENT_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_CONSISTENT_READ_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_NAME_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_DOC);
@@ -163,12 +153,10 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_DOC);
-        conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_AMAZON_DDBCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_AMAZON_DDBCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_AMAZON_DDBCLIENT_DOC);
-        conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_CONSISTENT_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_CONSISTENT_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_CONSISTENT_READ_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_KEY_ATTRIBUTE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_KEY_ATTRIBUTE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_KEY_ATTRIBUTE_NAME_DOC);
@@ -182,7 +170,7 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_DOC);
-        conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWS2DDB_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-source.json b/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-source.json
index fcf834d..3a6f737 100644
--- a/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-source.json
+++ b/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-source.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.source.endpoint.autoDiscoverClient": {
-			"name": "camel.source.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.amazonDynamoDbStreamsClient": {
 			"name": "camel.source.endpoint.amazonDynamoDbStreamsClient",
 			"description": "Amazon DynamoDB client to use for all requests for this endpoint",
@@ -111,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -230,13 +216,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.autoDiscoverClient": {
-			"name": "camel.component.aws2-ddbstream.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ddbstream.amazonDynamoDbStreamsClient": {
 			"name": "camel.component.aws2-ddbstream.amazonDynamoDbStreamsClient",
 			"description": "Amazon DynamoDB client to use for all requests for this endpoint",
@@ -307,11 +286,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.basicPropertyBinding": {
-			"name": "camel.component.aws2-ddbstream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ddbstream.autowiredEnabled": {
+			"name": "camel.component.aws2-ddbstream.autowiredEnabled",
+			"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 then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-ddbstream.accessKey": {
diff --git a/connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc b/connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc
index f8a7c0b..8282663 100644
--- a/connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc
+++ b/connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ddbstream.CamelAws2ddbstream
 ----
 
 
-The camel-aws2-ddbstream source connector supports 49 options, which are listed below.
+The camel-aws2-ddbstream source connector supports 46 options, which are listed below.
 
 
 
@@ -30,7 +30,6 @@ The camel-aws2-ddbstream source connector supports 49 options, which are listed
 |===
 | Name | Description | Default | Required | Priority
 | *camel.source.path.tableName* | Name of the dynamodb table | null | true | HIGH
-| *camel.source.endpoint.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | false | MEDIUM
 | *camel.source.endpoint.amazonDynamoDbStreamsClient* | Amazon DynamoDB client to use for all requests for this endpoint | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | 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 message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.iteratorType* | Defines where in the DynaboDB stream to start getting records. Note that using TRIM_HORIZON can cause a significant delay before the stream has caught up to real-time. if {AT,AFTER}_SEQUENCE_NUMBER are used, then a sequenceNumberProvider MUST be supplied. One of: [TRIM_HORIZON] [LATEST] [AT_SEQUENCE_NUMBER] [AFTER_SEQUENCE_NUMBER] [null] | "LATEST" | false | MEDIUM
@@ -45,7 +44,6 @@ The camel-aws2-ddbstream source connector supports 49 options, which are listed
 | *camel.source.endpoint.exceptionHandler* | 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 consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.backoffErrorThreshold* | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
... 66887 lines suppressed ...


[camel-kafka-connector] 15/21: Camel-kafka-connector-catalog: Avoid to check for number of options on camel-master

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

github-bot pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 3810a62541afa480137b1b04f79d1fc1da3f551f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Nov 20 06:57:32 2020 +0100

    Camel-kafka-connector-catalog: Avoid to check for number of options on camel-master
---
 .../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 4bcd084..9b381c5 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -58,7 +58,6 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector", model.getGroupId());
         assertEquals("sink", model.getType());
         assertEquals("org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SinkConnector", model.getConnectorClass());
-        assertEquals(58, model.getOptions().size());
         assertEquals("camel.sink.path.bucketNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonS3Client", model.getOptions().get(1).getName());
         assertEquals("camel.sink.endpoint.autoCreateBucket", model.getOptions().get(2).getName());
@@ -74,7 +73,6 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector", model.getGroupId());
         assertEquals("sink", model.getType());
         assertEquals("org.apache.camel.kafkaconnector.aws2sns.CamelAws2snsSinkConnector", model.getConnectorClass());
-        assertEquals(41, model.getOptions().size());
         assertEquals("camel.sink.path.topicNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonSNSClient", model.getOptions().get(1).getName());
         assertEquals("camel.sink.endpoint.autoCreateTopic", model.getOptions().get(2).getName());
@@ -92,7 +90,6 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector", model.getGroupId());
         assertEquals("source", model.getType());
         assertEquals("org.apache.camel.kafkaconnector.couchbase.CamelCouchbaseSourceConnector", model.getConnectorClass());
-        assertEquals(43, model.getOptions().size());
         assertEquals("camel.source.path.protocol", model.getOptions().get(0).getName());
         assertNull(model.getOptions().get(0).getDefaultValue());
         assertNull(model.getConverters());