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

[camel-kafka-connector] 17/17: Regen

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

acosentino pushed a commit to branch camel-master-align-and-rebase
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 02a656ba38c614156832d04ab29a5ae32b3a8654
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 ...