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

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

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

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

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

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

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-sink.json
index b0261fb..6f782e1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-sink.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -87,11 +80,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jooq.basicPropertyBinding": {
-			"name": "camel.component.jooq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jooq.autowiredEnabled": {
+			"name": "camel.component.jooq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-source.json
index 084c01d..424e1f8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jooq-source.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -193,11 +186,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jooq.basicPropertyBinding": {
-			"name": "camel.component.jooq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jooq.autowiredEnabled": {
+			"name": "camel.component.jooq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-sink.json
index c7dedc4..c6b3189 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-sink.json
@@ -108,13 +108,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.entityManagerProperties": {
 			"name": "camel.sink.endpoint.entityManagerProperties",
 			"description": "Additional properties for the entity manager to use.",
@@ -168,11 +161,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jpa.basicPropertyBinding": {
-			"name": "camel.component.jpa.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jpa.autowiredEnabled": {
+			"name": "camel.component.jpa.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-source.json
index b848943..61df69e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jpa-source.json
@@ -151,13 +151,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.entityManagerProperties": {
 			"name": "camel.source.endpoint.entityManagerProperties",
 			"description": "Additional properties for the entity manager to use.",
@@ -304,11 +297,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jpa.basicPropertyBinding": {
-			"name": "camel.component.jpa.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jpa.autowiredEnabled": {
+			"name": "camel.component.jpa.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jslt-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jslt-sink.json
index f0f5fb8..c62c706 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jslt-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jslt-sink.json
@@ -50,13 +50,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -78,11 +71,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jslt.basicPropertyBinding": {
-			"name": "camel.component.jslt.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jslt.autowiredEnabled": {
+			"name": "camel.component.jslt.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.jslt.functions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-json-validator-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-json-validator-sink.json
index 5458171..7a818f4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-json-validator-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-json-validator-sink.json
@@ -56,13 +56,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.errorHandler": {
 			"name": "camel.sink.endpoint.errorHandler",
 			"description": "To use a custom ValidatorErrorHandler. The default error handler captures the errors and throws an exception.",
@@ -89,11 +82,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.json-validator.basicPropertyBinding": {
-			"name": "camel.component.json-validator.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.json-validator.autowiredEnabled": {
+			"name": "camel.component.json-validator.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jsonata-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jsonata-sink.json
index 6fa3064..3eab12b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jsonata-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jsonata-sink.json
@@ -50,13 +50,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -71,11 +64,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jsonata.basicPropertyBinding": {
-			"name": "camel.component.jsonata.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jsonata.autowiredEnabled": {
+			"name": "camel.component.jsonata.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-sink.json
index 39577e8..2b68c4a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-sink.json
@@ -97,13 +97,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -125,11 +118,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jt400.basicPropertyBinding": {
-			"name": "camel.component.jt400.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jt400.autowiredEnabled": {
+			"name": "camel.component.jt400.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.jt400.connectionPool": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-source.json
index bda05c2..c1cb5f6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-jt400-source.json
@@ -125,13 +125,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -246,11 +239,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.jt400.basicPropertyBinding": {
-			"name": "camel.component.jt400.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.jt400.autowiredEnabled": {
+			"name": "camel.component.jt400.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.jt400.connectionPool": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json
index d5b3d67..49c966e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-sink.json
@@ -272,13 +272,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -717,11 +710,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.basicPropertyBinding": {
-			"name": "camel.component.kafka.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kafka.autowiredEnabled": {
+			"name": "camel.component.kafka.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.kafka.schemaRegistryURL": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
index d2d7b87..6f7d884 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kafka-source.json
@@ -263,13 +263,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -663,11 +656,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kafka.basicPropertyBinding": {
-			"name": "camel.component.kafka.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kafka.autowiredEnabled": {
+			"name": "camel.component.kafka.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.kafka.schemaRegistryURL": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-config-maps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-config-maps-sink.json
index 679dfc1..8ec19cf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-config-maps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-config-maps-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-config-maps.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-config-maps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-config-maps.autowiredEnabled": {
+			"name": "camel.component.kubernetes-config-maps.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-sink.json
index bff86b3..63bf1eb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,12 +151,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-custom-resources.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-custom-resources.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-custom-resources.autowiredEnabled": {
+			"name": "camel.component.kubernetes-custom-resources.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-source.json
index 740c5a2..7dd2386 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-custom-resources-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,12 +218,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-custom-resources.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-custom-resources.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-custom-resources.autowiredEnabled": {
+			"name": "camel.component.kubernetes-custom-resources.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-sink.json
index 478e170..9037422 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-deployments.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-deployments.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-deployments.autowiredEnabled": {
+			"name": "camel.component.kubernetes-deployments.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json
index bfb7af9..e5d0cba 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-deployments-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-deployments.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-deployments.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-deployments.autowiredEnabled": {
+			"name": "camel.component.kubernetes-deployments.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-sink.json
index 0a35e55..aca26fb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-hpa.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-hpa.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-hpa.autowiredEnabled": {
+			"name": "camel.component.kubernetes-hpa.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
index d88584c..0b1bb40 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-hpa-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-hpa.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-hpa.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-hpa.autowiredEnabled": {
+			"name": "camel.component.kubernetes-hpa.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-sink.json
index cf7ce33..0071d9f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-job.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-job.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-job.autowiredEnabled": {
+			"name": "camel.component.kubernetes-job.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json
index dcea34d..a95e1c0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-job-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-job.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-job.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-job.autowiredEnabled": {
+			"name": "camel.component.kubernetes-job.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-sink.json
index bf0a093..918a3b5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-namespaces.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-namespaces.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-namespaces.autowiredEnabled": {
+			"name": "camel.component.kubernetes-namespaces.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json
index a38bb65..98daffa 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-namespaces-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-namespaces.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-namespaces.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-namespaces.autowiredEnabled": {
+			"name": "camel.component.kubernetes-namespaces.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-sink.json
index 96f4412..f50a547 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-nodes.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-nodes.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-nodes.autowiredEnabled": {
+			"name": "camel.component.kubernetes-nodes.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json
index 320bb79..75d4cf5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-nodes-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-nodes.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-nodes.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-nodes.autowiredEnabled": {
+			"name": "camel.component.kubernetes-nodes.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-claims-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-claims-sink.json
index a2dfaf3..b4aa612 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-claims-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-claims-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-persistent-volumes-claims.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-persistent-volumes-claims.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-persistent-volumes-claims.autowiredEnabled": {
+			"name": "camel.component.kubernetes-persistent-volumes-claims.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-sink.json
index fa13172..5af1a6d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-persistent-volumes-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-persistent-volumes.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-persistent-volumes.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-persistent-volumes.autowiredEnabled": {
+			"name": "camel.component.kubernetes-persistent-volumes.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-sink.json
index b72484f..ce6ae7a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-pods.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-pods.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-pods.autowiredEnabled": {
+			"name": "camel.component.kubernetes-pods.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json
index 1679e6e..e775a94 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-pods-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-pods.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-pods.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-pods.autowiredEnabled": {
+			"name": "camel.component.kubernetes-pods.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-sink.json
index 47b9ad0..c04ecdd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-replication-controllers.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-replication-controllers.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-replication-controllers.autowiredEnabled": {
+			"name": "camel.component.kubernetes-replication-controllers.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json
index 693f9c0..a1ffb55 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-replication-controllers-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-replication-controllers.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-replication-controllers.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-replication-controllers.autowiredEnabled": {
+			"name": "camel.component.kubernetes-replication-controllers.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-resources-quota-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-resources-quota-sink.json
index 3729af5..713f280 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-resources-quota-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-resources-quota-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-resources-quota.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-resources-quota.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-resources-quota.autowiredEnabled": {
+			"name": "camel.component.kubernetes-resources-quota.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-secrets-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-secrets-sink.json
index 61bbb09..741af8e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-secrets-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-secrets-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-secrets.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-secrets.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-secrets.autowiredEnabled": {
+			"name": "camel.component.kubernetes-secrets.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-service-accounts-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-service-accounts-sink.json
index 68fa9a4..c0d8524 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-service-accounts-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-service-accounts-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-service-accounts.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-service-accounts.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-service-accounts.autowiredEnabled": {
+			"name": "camel.component.kubernetes-service-accounts.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-sink.json
index 004d2eb..e7c6557 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-services.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-services.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-services.autowiredEnabled": {
+			"name": "camel.component.kubernetes-services.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json
index 0151fa7..d068f21 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kubernetes-services-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionTimeout": {
 			"name": "camel.source.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kubernetes-services.basicPropertyBinding": {
-			"name": "camel.component.kubernetes-services.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kubernetes-services.autowiredEnabled": {
+			"name": "camel.component.kubernetes-services.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kudu-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kudu-sink.json
index c8d0253..8fd9cc4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kudu-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-kudu-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.kudu.basicPropertyBinding": {
-			"name": "camel.component.kudu.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.kudu.autowiredEnabled": {
+			"name": "camel.component.kudu.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-language-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-language-sink.json
index eea5672..c0a203d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-language-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-language-sink.json
@@ -69,13 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -90,11 +83,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.language.basicPropertyBinding": {
-			"name": "camel.component.language.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.language.autowiredEnabled": {
+			"name": "camel.component.language.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldap-sink.json
index c1a06af..fe641bd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldap-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -69,11 +62,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ldap.basicPropertyBinding": {
-			"name": "camel.component.ldap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ldap.autowiredEnabled": {
+			"name": "camel.component.ldap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldif-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldif-sink.json
index 5046689..a965f47 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldif-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ldif-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ldif.basicPropertyBinding": {
-			"name": "camel.component.ldif.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ldif.autowiredEnabled": {
+			"name": "camel.component.ldif.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-log-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-log-sink.json
index ba1af8e..1fad9a5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-log-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-log-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.exchangeFormatter": {
 			"name": "camel.sink.endpoint.exchangeFormatter",
 			"description": "To use a custom exchange formatter",
@@ -212,11 +205,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.log.basicPropertyBinding": {
-			"name": "camel.component.log.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.log.autowiredEnabled": {
+			"name": "camel.component.log.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.log.exchangeFormatter": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lpr-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lpr-sink.json
index 41915e1..08f826d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lpr-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lpr-sink.json
@@ -99,13 +99,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -120,11 +113,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.lpr.basicPropertyBinding": {
-			"name": "camel.component.lpr.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.lpr.autowiredEnabled": {
+			"name": "camel.component.lpr.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lucene-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lucene-sink.json
index cf3b0b0..bc8de1f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lucene-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lucene-sink.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -97,11 +90,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.lucene.basicPropertyBinding": {
-			"name": "camel.component.lucene.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.lucene.autowiredEnabled": {
+			"name": "camel.component.lucene.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.lucene.config": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lumberjack-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lumberjack-source.json
index f4e2b77..ca7af91 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lumberjack-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-lumberjack-source.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -68,11 +61,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.lumberjack.basicPropertyBinding": {
-			"name": "camel.component.lumberjack.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.lumberjack.autowiredEnabled": {
+			"name": "camel.component.lumberjack.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.lumberjack.sslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-master-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-master-source.json
index d89b37d..9062383 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-master-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-master-source.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.master.basicPropertyBinding": {
-			"name": "camel.component.master.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.master.autowiredEnabled": {
+			"name": "camel.component.master.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.master.service": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-metrics-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-metrics-sink.json
index 0faf95e..164b1c1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-metrics-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-metrics-sink.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -85,11 +78,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.metrics.basicPropertyBinding": {
-			"name": "camel.component.metrics.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.metrics.autowiredEnabled": {
+			"name": "camel.component.metrics.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.metrics.metricRegistry": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-micrometer-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-micrometer-sink.json
index e9d3738..0b203ba 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-micrometer-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-micrometer-sink.json
@@ -58,13 +58,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -79,11 +72,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.micrometer.basicPropertyBinding": {
-			"name": "camel.component.micrometer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.micrometer.autowiredEnabled": {
+			"name": "camel.component.micrometer.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.micrometer.metricsRegistry": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-microprofile-metrics-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-microprofile-metrics-sink.json
index 709ac6c..20bfef6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-microprofile-metrics-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-microprofile-metrics-sink.json
@@ -94,13 +94,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -115,11 +108,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.microprofile-metrics.basicPropertyBinding": {
-			"name": "camel.component.microprofile-metrics.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.microprofile-metrics.autowiredEnabled": {
+			"name": "camel.component.microprofile-metrics.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.microprofile-metrics.metricRegistry": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-sink.json
index 1f3f350..7948262 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -218,11 +211,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.milo-client.basicPropertyBinding": {
-			"name": "camel.component.milo-client.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.milo-client.autowiredEnabled": {
+			"name": "camel.component.milo-client.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.milo-client.allowedSecurityPolicies": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-source.json
index be019f2..a4fd9f9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-client-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -230,11 +223,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.milo-client.basicPropertyBinding": {
-			"name": "camel.component.milo-client.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.milo-client.autowiredEnabled": {
+			"name": "camel.component.milo-client.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.milo-client.allowedSecurityPolicies": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-sink.json
index 648de33..b424c8c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.milo-server.basicPropertyBinding": {
-			"name": "camel.component.milo-server.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.milo-server.autowiredEnabled": {
+			"name": "camel.component.milo-server.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.milo-server.certificate": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-source.json
index 5224430..c6398d4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-milo-server-source.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -104,11 +97,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.milo-server.basicPropertyBinding": {
-			"name": "camel.component.milo-server.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.milo-server.autowiredEnabled": {
+			"name": "camel.component.milo-server.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.milo-server.certificate": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-sink.json
index 73a7925..9c72d1c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-sink.json
@@ -83,13 +83,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.maximumPoolSize": {
 			"name": "camel.sink.endpoint.maximumPoolSize",
 			"description": "Number of worker threads in the worker pool for TCP and UDP",
@@ -239,11 +232,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mina.basicPropertyBinding": {
-			"name": "camel.component.mina.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mina.autowiredEnabled": {
+			"name": "camel.component.mina.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mina.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-source.json
index ea986ff..512d26a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mina-source.json
@@ -102,13 +102,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.maximumPoolSize": {
 			"name": "camel.source.endpoint.maximumPoolSize",
 			"description": "Number of worker threads in the worker pool for TCP and UDP",
@@ -265,11 +258,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mina.basicPropertyBinding": {
-			"name": "camel.component.mina.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mina.autowiredEnabled": {
+			"name": "camel.component.mina.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mina.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-sink.json
index fddf6ad..1de6ae5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-sink.json
@@ -123,13 +123,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -263,11 +256,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.minio.basicPropertyBinding": {
-			"name": "camel.component.minio.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.minio.autowiredEnabled": {
+			"name": "camel.component.minio.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.minio.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-source.json
index 6c52e93..d5bc137 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-minio-source.json
@@ -278,13 +278,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -641,11 +634,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.minio.basicPropertyBinding": {
-			"name": "camel.component.minio.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.minio.autowiredEnabled": {
+			"name": "camel.component.minio.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.minio.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-sink.json
index 02fac4b..df6dbde 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-sink.json
@@ -70,13 +70,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used (this component only supports synchronous operations).",
@@ -152,11 +145,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mllp.basicPropertyBinding": {
-			"name": "camel.component.mllp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mllp.autowiredEnabled": {
+			"name": "camel.component.mllp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mllp.defaultCharset": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-source.json
index 3e6e9e3..273cb6c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mllp-source.json
@@ -83,13 +83,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used (this component only supports synchronous operations).",
@@ -199,11 +192,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mllp.basicPropertyBinding": {
-			"name": "camel.component.mllp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mllp.autowiredEnabled": {
+			"name": "camel.component.mllp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mllp.defaultCharset": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-sink.json
index 3fd9257..aff0102 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-sink.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -74,11 +67,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mongodb-gridfs.basicPropertyBinding": {
-			"name": "camel.component.mongodb-gridfs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mongodb-gridfs.autowiredEnabled": {
+			"name": "camel.component.mongodb-gridfs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-source.json
index d2f4a92..13b34f9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-gridfs-source.json
@@ -107,13 +107,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -128,11 +121,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mongodb-gridfs.basicPropertyBinding": {
-			"name": "camel.component.mongodb-gridfs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mongodb-gridfs.autowiredEnabled": {
+			"name": "camel.component.mongodb-gridfs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-sink.json
index e4aebfb..266ad15 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-sink.json
@@ -65,13 +65,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.cursorRegenerationDelay": {
 			"name": "camel.sink.endpoint.cursorRegenerationDelay",
 			"description": "MongoDB tailable cursors will block until new data arrives. If no new data is inserted, after some time the cursor will be automatically freed and closed by the MongoDB server. The client is expected to regenerate the cursor if needed. This value specifies the time to wait before attempting to fetch a new cursor, and if the attempt fails, how long before the next attempt is made. Default value is 1000ms.",
@@ -170,11 +163,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mongodb.basicPropertyBinding": {
-			"name": "camel.component.mongodb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mongodb.autowiredEnabled": {
+			"name": "camel.component.mongodb.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-source.json
index 1132762..b90b8a7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mongodb-source.json
@@ -83,13 +83,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.cursorRegenerationDelay": {
 			"name": "camel.source.endpoint.cursorRegenerationDelay",
 			"description": "MongoDB tailable cursors will block until new data arrives. If no new data is inserted, after some time the cursor will be automatically freed and closed by the MongoDB server. The client is expected to regenerate the cursor if needed. This value specifies the time to wait before attempting to fetch a new cursor, and if the attempt fails, how long before the next attempt is made. Default value is 1000ms.",
@@ -188,11 +181,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mongodb.basicPropertyBinding": {
-			"name": "camel.component.mongodb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mongodb.autowiredEnabled": {
+			"name": "camel.component.mongodb.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-msv-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-msv-sink.json
index 8fea8db..4881c35 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-msv-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-msv-sink.json
@@ -42,13 +42,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.errorHandler": {
 			"name": "camel.sink.endpoint.errorHandler",
 			"description": "To use a custom org.apache.camel.processor.validation.ValidatorErrorHandler. The default error handler captures the errors and throws an exception.",
@@ -101,11 +94,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.msv.basicPropertyBinding": {
-			"name": "camel.component.msv.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.msv.autowiredEnabled": {
+			"name": "camel.component.msv.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.msv.resourceResolverFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mustache-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mustache-sink.json
index 3e32ded..b30a7b7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mustache-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mustache-sink.json
@@ -63,13 +63,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mustache.basicPropertyBinding": {
-			"name": "camel.component.mustache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mustache.autowiredEnabled": {
+			"name": "camel.component.mustache.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mustache.mustacheFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mvel-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mvel-sink.json
index 8fdebcf..b5b1251 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mvel-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mvel-sink.json
@@ -49,13 +49,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -84,11 +77,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mvel.basicPropertyBinding": {
-			"name": "camel.component.mvel.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mvel.autowiredEnabled": {
+			"name": "camel.component.mvel.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-bean-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-bean-sink.json
index 6b3ae11..692f7a3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-bean-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-bean-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -75,11 +68,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mybatis-bean.basicPropertyBinding": {
-			"name": "camel.component.mybatis-bean.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mybatis-bean.autowiredEnabled": {
+			"name": "camel.component.mybatis-bean.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mybatis-bean.sqlSessionFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-sink.json
index ef4c710..10ac780 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -75,11 +68,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mybatis.basicPropertyBinding": {
-			"name": "camel.component.mybatis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mybatis.autowiredEnabled": {
+			"name": "camel.component.mybatis.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mybatis.sqlSessionFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-source.json
index bfa42d4..2b6dd60 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-mybatis-source.json
@@ -87,13 +87,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -208,11 +201,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.mybatis.basicPropertyBinding": {
-			"name": "camel.component.mybatis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.mybatis.autowiredEnabled": {
+			"name": "camel.component.mybatis.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.mybatis.sqlSessionFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nagios-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nagios-sink.json
index 9944414..1943d28 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nagios-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nagios-sink.json
@@ -49,13 +49,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -96,11 +89,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nagios.basicPropertyBinding": {
-			"name": "camel.component.nagios.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nagios.autowiredEnabled": {
+			"name": "camel.component.nagios.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.nagios.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-sink.json
index ba99c54..e4f738d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-sink.json
@@ -125,13 +125,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connection": {
 			"name": "camel.sink.endpoint.connection",
 			"description": "Reference an already instantiated connection to Nats server",
@@ -145,6 +138,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.traceConnection": {
+			"name": "camel.sink.endpoint.traceConnection",
+			"description": "Whether or not connection trace messages should be printed to standard out for fine grained debugging of connection issues.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.secure": {
 			"name": "camel.sink.endpoint.secure",
 			"description": "Set secure option indicating TLS is required",
@@ -178,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nats.basicPropertyBinding": {
-			"name": "camel.component.nats.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nats.autowiredEnabled": {
+			"name": "camel.component.nats.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.nats.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-source.json
index ff5be7e..c38dce2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nats-source.json
@@ -157,13 +157,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connection": {
 			"name": "camel.source.endpoint.connection",
 			"description": "Reference an already instantiated connection to Nats server",
@@ -177,6 +170,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.traceConnection": {
+			"name": "camel.source.endpoint.traceConnection",
+			"description": "Whether or not connection trace messages should be printed to standard out for fine grained debugging of connection issues.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.secure": {
 			"name": "camel.source.endpoint.secure",
 			"description": "Set secure option indicating TLS is required",
@@ -210,11 +210,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nats.basicPropertyBinding": {
-			"name": "camel.component.nats.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nats.autowiredEnabled": {
+			"name": "camel.component.nats.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.nats.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
index 6428d1a..9705bc9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-sink.json
@@ -183,13 +183,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.channelGroup": {
 			"name": "camel.sink.endpoint.channelGroup",
 			"description": "To use a explicit ChannelGroup.",
@@ -516,11 +509,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.netty-http.basicPropertyBinding": {
-			"name": "camel.component.netty-http.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.netty-http.autowiredEnabled": {
+			"name": "camel.component.netty-http.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.netty-http.channelGroup": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-source.json
index eadb818..3958b43 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-http-source.json
@@ -256,13 +256,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.channelGroup": {
 			"name": "camel.source.endpoint.channelGroup",
 			"description": "To use a explicit ChannelGroup.",
@@ -640,11 +633,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.netty-http.basicPropertyBinding": {
-			"name": "camel.component.netty-http.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.netty-http.autowiredEnabled": {
+			"name": "camel.component.netty-http.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.netty-http.channelGroup": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-sink.json
index 2d62b86..580917f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nitrite.basicPropertyBinding": {
-			"name": "camel.component.nitrite.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nitrite.autowiredEnabled": {
+			"name": "camel.component.nitrite.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-source.json
index 309be8f..b3800c4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nitrite-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -85,11 +78,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nitrite.basicPropertyBinding": {
-			"name": "camel.component.nitrite.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nitrite.autowiredEnabled": {
+			"name": "camel.component.nitrite.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-sink.json
index 212bf29..44c46a2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-sink.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -81,11 +74,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nsq.basicPropertyBinding": {
-			"name": "camel.component.nsq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nsq.autowiredEnabled": {
+			"name": "camel.component.nsq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.nsq.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-source.json
index c62fa74..0092528 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-nsq-source.json
@@ -100,13 +100,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -140,11 +133,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.nsq.basicPropertyBinding": {
-			"name": "camel.component.nsq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.nsq.autowiredEnabled": {
+			"name": "camel.component.nsq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.nsq.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-sink.json
index f321ff4..c3f6bca 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-sink.json
@@ -67,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -102,11 +95,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.oaipmh.basicPropertyBinding": {
-			"name": "camel.component.oaipmh.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.oaipmh.autowiredEnabled": {
+			"name": "camel.component.oaipmh.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-source.json
index 8011b71..de7bfe2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-oaipmh-source.json
@@ -85,13 +85,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -213,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.oaipmh.basicPropertyBinding": {
-			"name": "camel.component.oaipmh.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.oaipmh.autowiredEnabled": {
+			"name": "camel.component.oaipmh.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-sink.json
index fdae45e..ca5b675 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-sink.json
@@ -92,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.httpAsyncClientBuilder": {
 			"name": "camel.sink.endpoint.httpAsyncClientBuilder",
 			"description": "Custom HTTP async client builder for more complex HTTP client configuration, overrides connectionTimeout, socketTimeout, proxy and sslContext. Note that a socketTimeout MUST be specified in the builder, otherwise OData requests could block indefinitely",
@@ -195,11 +188,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.olingo2.basicPropertyBinding": {
-			"name": "camel.component.olingo2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.olingo2.autowiredEnabled": {
+			"name": "camel.component.olingo2.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.olingo2.httpAsyncClientBuilder": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-source.json
index 400fbe7..3152e39 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo2-source.json
@@ -124,13 +124,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.httpAsyncClientBuilder": {
 			"name": "camel.source.endpoint.httpAsyncClientBuilder",
 			"description": "Custom HTTP async client builder for more complex HTTP client configuration, overrides connectionTimeout, socketTimeout, proxy and sslContext. Note that a socketTimeout MUST be specified in the builder, otherwise OData requests could block indefinitely",
@@ -327,11 +320,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.olingo2.basicPropertyBinding": {
-			"name": "camel.component.olingo2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.olingo2.autowiredEnabled": {
+			"name": "camel.component.olingo2.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.olingo2.httpAsyncClientBuilder": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-sink.json
index 59b4e5c..9fb132c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-sink.json
@@ -80,13 +80,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.httpAsyncClientBuilder": {
 			"name": "camel.sink.endpoint.httpAsyncClientBuilder",
 			"description": "Custom HTTP async client builder for more complex HTTP client configuration, overrides connectionTimeout, socketTimeout, proxy and sslContext. Note that a socketTimeout MUST be specified in the builder, otherwise OData requests could block indefinitely",
@@ -171,11 +164,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.olingo4.basicPropertyBinding": {
-			"name": "camel.component.olingo4.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.olingo4.autowiredEnabled": {
+			"name": "camel.component.olingo4.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.olingo4.httpAsyncClientBuilder": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-source.json
index a9b36a7..22f0483 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-olingo4-source.json
@@ -112,13 +112,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.httpAsyncClientBuilder": {
 			"name": "camel.source.endpoint.httpAsyncClientBuilder",
 			"description": "Custom HTTP async client builder for more complex HTTP client configuration, overrides connectionTimeout, socketTimeout, proxy and sslContext. Note that a socketTimeout MUST be specified in the builder, otherwise OData requests could block indefinitely",
@@ -303,11 +296,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.olingo4.basicPropertyBinding": {
-			"name": "camel.component.olingo4.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.olingo4.autowiredEnabled": {
+			"name": "camel.component.olingo4.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.olingo4.httpAsyncClientBuilder": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-build-configs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-build-configs-sink.json
index 7a2ebee..f3943ad 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-build-configs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-build-configs-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openshift-build-configs.basicPropertyBinding": {
-			"name": "camel.component.openshift-build-configs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openshift-build-configs.autowiredEnabled": {
+			"name": "camel.component.openshift-build-configs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-builds-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-builds-sink.json
index 44fc063..d2975ce 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-builds-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openshift-builds-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionTimeout": {
 			"name": "camel.sink.endpoint.connectionTimeout",
 			"description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openshift-builds.basicPropertyBinding": {
-			"name": "camel.component.openshift-builds.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openshift-builds.autowiredEnabled": {
+			"name": "camel.component.openshift-builds.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-cinder-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-cinder-sink.json
index 69f54be..aa39dfc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-cinder-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-cinder-sink.json
@@ -72,13 +72,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -93,11 +86,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openstack-cinder.basicPropertyBinding": {
-			"name": "camel.component.openstack-cinder.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openstack-cinder.autowiredEnabled": {
+			"name": "camel.component.openstack-cinder.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-glance-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-glance-sink.json
index bf6fc0d..95b30e1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-glance-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-glance-sink.json
@@ -66,13 +66,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -87,11 +80,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openstack-glance.basicPropertyBinding": {
-			"name": "camel.component.openstack-glance.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openstack-glance.autowiredEnabled": {
+			"name": "camel.component.openstack-glance.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-keystone-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-keystone-sink.json
index 6a7456a..bf6ee10 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-keystone-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-keystone-sink.json
@@ -65,13 +65,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -86,11 +79,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openstack-keystone.basicPropertyBinding": {
-			"name": "camel.component.openstack-keystone.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openstack-keystone.autowiredEnabled": {
+			"name": "camel.component.openstack-keystone.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-neutron-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-neutron-sink.json
index 71900b2..2ff77ab 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-neutron-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-neutron-sink.json
@@ -72,13 +72,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -93,11 +86,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openstack-neutron.basicPropertyBinding": {
-			"name": "camel.component.openstack-neutron.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openstack-neutron.autowiredEnabled": {
+			"name": "camel.component.openstack-neutron.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-nova-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-nova-sink.json
index ee13a1a..d37b82a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-nova-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-nova-sink.json
@@ -72,13 +72,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -93,11 +86,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openstack-nova.basicPropertyBinding": {
-			"name": "camel.component.openstack-nova.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openstack-nova.autowiredEnabled": {
+			"name": "camel.component.openstack-nova.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-swift-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-swift-sink.json
index 3bc0810..5066da0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-swift-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-openstack-swift-sink.json
@@ -72,13 +72,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -93,11 +86,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.openstack-swift.basicPropertyBinding": {
-			"name": "camel.component.openstack-swift.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.openstack-swift.autowiredEnabled": {
+			"name": "camel.component.openstack-swift.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-sink.json
index b1eba03..6ac4ef9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-sink.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -78,11 +71,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.optaplanner.basicPropertyBinding": {
-			"name": "camel.component.optaplanner.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.optaplanner.autowiredEnabled": {
+			"name": "camel.component.optaplanner.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-source.json
index 3eb6ab9..517c390 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-optaplanner-source.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -76,11 +69,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.optaplanner.basicPropertyBinding": {
-			"name": "camel.component.optaplanner.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.optaplanner.autowiredEnabled": {
+			"name": "camel.component.optaplanner.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-sink.json
index db0f150..9677fce 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-sink.json
@@ -141,13 +141,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.client": {
 			"name": "camel.sink.endpoint.client",
 			"description": "To use an existing mqtt client",
@@ -343,11 +336,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.paho.basicPropertyBinding": {
-			"name": "camel.component.paho.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.paho.autowiredEnabled": {
+			"name": "camel.component.paho.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.paho.client": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-source.json
index 9605eba..d334b27 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-paho-source.json
@@ -153,13 +153,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.client": {
 			"name": "camel.source.endpoint.client",
 			"description": "To use an existing mqtt client",
@@ -355,11 +348,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.paho.basicPropertyBinding": {
-			"name": "camel.component.paho.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.paho.autowiredEnabled": {
+			"name": "camel.component.paho.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.paho.client": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pdf-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pdf-sink.json
index aeb57d5..4cd3751 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pdf-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pdf-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -99,11 +92,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pdf.basicPropertyBinding": {
-			"name": "camel.component.pdf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pdf.autowiredEnabled": {
+			"name": "camel.component.pdf.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pg-replication-slot-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pg-replication-slot-source.json
index 44474b0..513a41e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pg-replication-slot-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pg-replication-slot-source.json
@@ -93,13 +93,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.slotOptions": {
 			"name": "camel.source.endpoint.slotOptions",
 			"description": "Slot options to be passed to the output plugin.",
@@ -220,11 +213,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pg-replication-slot.basicPropertyBinding": {
-			"name": "camel.component.pg-replication-slot.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pg-replication-slot.autowiredEnabled": {
+			"name": "camel.component.pg-replication-slot.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-sink.json
index 7fbf473..616fee9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -82,11 +75,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pgevent.basicPropertyBinding": {
-			"name": "camel.component.pgevent.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pgevent.autowiredEnabled": {
+			"name": "camel.component.pgevent.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-source.json
index 5d0468f..758e9d8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pgevent-source.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pgevent.basicPropertyBinding": {
-			"name": "camel.component.pgevent.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pgevent.autowiredEnabled": {
+			"name": "camel.component.pgevent.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-platform-http-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-platform-http-source.json
index 0bb7dbf..c81aa9d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-platform-http-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-platform-http-source.json
@@ -65,13 +65,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter headers to and from Camel message.",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.platform-http.basicPropertyBinding": {
-			"name": "camel.component.platform-http.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.platform-http.autowiredEnabled": {
+			"name": "camel.component.platform-http.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.platform-http.engine": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-sink.json
index dc612ce..e28ff58 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -275,11 +268,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pop3.basicPropertyBinding": {
-			"name": "camel.component.pop3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pop3.autowiredEnabled": {
+			"name": "camel.component.pop3.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.pop3.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-source.json
index 4e4f738..b2ace02 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3-source.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -528,11 +521,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pop3.basicPropertyBinding": {
-			"name": "camel.component.pop3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pop3.autowiredEnabled": {
+			"name": "camel.component.pop3.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.pop3.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-sink.json
index f7cabe0..6218580 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -275,11 +268,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pop3s.basicPropertyBinding": {
-			"name": "camel.component.pop3s.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pop3s.autowiredEnabled": {
+			"name": "camel.component.pop3s.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.pop3s.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-source.json
index a65bbfe..fe7103c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pop3s-source.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -528,11 +521,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pop3s.basicPropertyBinding": {
-			"name": "camel.component.pop3s.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pop3s.autowiredEnabled": {
+			"name": "camel.component.pop3s.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.pop3s.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-sink.json
index 4b1be34..d7ddb06 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.pubnub": {
 			"name": "camel.sink.endpoint.pubnub",
 			"description": "Reference to a Pubnub client in the registry.",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pubnub.basicPropertyBinding": {
-			"name": "camel.component.pubnub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pubnub.autowiredEnabled": {
+			"name": "camel.component.pubnub.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-source.json
index e1e583c..c86f8dc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pubnub-source.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.pubnub": {
 			"name": "camel.source.endpoint.pubnub",
 			"description": "Reference to a Pubnub client in the registry.",
@@ -111,11 +104,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pubnub.basicPropertyBinding": {
-			"name": "camel.component.pubnub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pubnub.autowiredEnabled": {
+			"name": "camel.component.pubnub.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-sink.json
index 1f6ae6c..578a690 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-sink.json
@@ -129,13 +129,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -251,11 +244,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pulsar.basicPropertyBinding": {
-			"name": "camel.component.pulsar.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pulsar.autowiredEnabled": {
+			"name": "camel.component.pulsar.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.pulsar.pulsarClient": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json
index 36414b3..a65a861 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-pulsar-source.json
@@ -162,13 +162,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -311,11 +304,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.pulsar.basicPropertyBinding": {
-			"name": "camel.component.pulsar.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.pulsar.autowiredEnabled": {
+			"name": "camel.component.pulsar.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.pulsar.pulsarClient": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quartz-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quartz-source.json
index b3bf3fc..664d597 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quartz-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quartz-source.json
@@ -82,13 +82,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.customCalendar": {
 			"name": "camel.source.endpoint.customCalendar",
 			"description": "Specifies a custom calendar to avoid specific range of date",
@@ -201,11 +194,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.quartz.basicPropertyBinding": {
-			"name": "camel.component.quartz.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.quartz.autowiredEnabled": {
+			"name": "camel.component.quartz.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.quartz.scheduler": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-sink.json
index 0922a4b..6728ba4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-sink.json
@@ -35,13 +35,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -63,11 +56,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.quickfix.basicPropertyBinding": {
-			"name": "camel.component.quickfix.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.quickfix.autowiredEnabled": {
+			"name": "camel.component.quickfix.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.quickfix.logFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-source.json
index 221245b..f7df7a7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-quickfix-source.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -75,11 +68,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.quickfix.basicPropertyBinding": {
-			"name": "camel.component.quickfix.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.quickfix.autowiredEnabled": {
+			"name": "camel.component.quickfix.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.quickfix.logFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-sink.json
index 6e46800..9aafec4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-sink.json
@@ -254,13 +254,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientProperties": {
 			"name": "camel.sink.endpoint.clientProperties",
 			"description": "Connection client properties (client info used in negotiating with the server)",
@@ -581,11 +574,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rabbitmq.basicPropertyBinding": {
-			"name": "camel.component.rabbitmq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rabbitmq.autowiredEnabled": {
+			"name": "camel.component.rabbitmq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.rabbitmq.clientProperties": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-source.json
index a798931..d6d7d1f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rabbitmq-source.json
@@ -252,13 +252,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.clientProperties": {
 			"name": "camel.source.endpoint.clientProperties",
 			"description": "Connection client properties (client info used in negotiating with the server)",
@@ -559,11 +552,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rabbitmq.basicPropertyBinding": {
-			"name": "camel.component.rabbitmq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rabbitmq.autowiredEnabled": {
+			"name": "camel.component.rabbitmq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.rabbitmq.clientProperties": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-sink.json
index 31f40c1..db4481c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -76,11 +69,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.reactive-streams.basicPropertyBinding": {
-			"name": "camel.component.reactive-streams.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.reactive-streams.autowiredEnabled": {
+			"name": "camel.component.reactive-streams.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.reactive-streams.reactiveStreamsEngineConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-source.json
index 8b50239..957191d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-reactive-streams-source.json
@@ -69,13 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.reactive-streams.basicPropertyBinding": {
-			"name": "camel.component.reactive-streams.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.reactive-streams.autowiredEnabled": {
+			"name": "camel.component.reactive-streams.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.reactive-streams.reactiveStreamsEngineConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-api-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-api-source.json
index fbab86e..da3fe04 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-api-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-api-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rest-api.basicPropertyBinding": {
-			"name": "camel.component.rest-api.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rest-api.autowiredEnabled": {
+			"name": "camel.component.rest-api.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-openapi-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-openapi-sink.json
index 67d019a..9b8172e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-openapi-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-openapi-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -117,11 +110,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rest-openapi.basicPropertyBinding": {
-			"name": "camel.component.rest-openapi.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rest-openapi.autowiredEnabled": {
+			"name": "camel.component.rest-openapi.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.rest-openapi.sslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-sink.json
index 5c4762a..96ff8d4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-sink.json
@@ -94,13 +94,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -139,11 +132,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rest.basicPropertyBinding": {
-			"name": "camel.component.rest.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rest.autowiredEnabled": {
+			"name": "camel.component.rest.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-source.json
index a603444..b816567 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-source.json
@@ -88,13 +88,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -115,11 +108,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rest.basicPropertyBinding": {
-			"name": "camel.component.rest.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rest.autowiredEnabled": {
+			"name": "camel.component.rest.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-swagger-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-swagger-sink.json
index 5348ca2..f3c86ec 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-swagger-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rest-swagger-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -123,11 +116,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rest-swagger.basicPropertyBinding": {
-			"name": "camel.component.rest-swagger.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rest-swagger.autowiredEnabled": {
+			"name": "camel.component.rest-swagger.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.rest-swagger.sslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json
index 591d070..637fb68 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-sink.json
@@ -144,13 +144,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -236,11 +229,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.resteasy.basicPropertyBinding": {
-			"name": "camel.component.resteasy.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.resteasy.autowiredEnabled": {
+			"name": "camel.component.resteasy.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.resteasy.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json
index 7675b15..750c816 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-resteasy-source.json
@@ -122,13 +122,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -220,11 +213,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.resteasy.basicPropertyBinding": {
-			"name": "camel.component.resteasy.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.resteasy.autowiredEnabled": {
+			"name": "camel.component.resteasy.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.resteasy.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rss-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rss-source.json
index eef717e..24b7695 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rss-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-rss-source.json
@@ -100,13 +100,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -214,11 +207,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.rss.basicPropertyBinding": {
-			"name": "camel.component.rss.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.rss.autowiredEnabled": {
+			"name": "camel.component.rss.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-saga-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-saga-sink.json
index 6c56be1..1fe7755 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-saga-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-saga-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.saga.basicPropertyBinding": {
-			"name": "camel.component.saga.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.saga.autowiredEnabled": {
+			"name": "camel.component.saga.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-sink.json
index ae09777..c2f48bf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-sink.json
@@ -36,7 +36,7 @@
 		"camel.sink.endpoint.apiVersion": {
 			"name": "camel.sink.endpoint.apiVersion",
 			"description": "Salesforce API version.",
-			"defaultValue": "\"34.0\"",
+			"defaultValue": "\"50.0\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -256,13 +256,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -291,7 +284,7 @@
 		"camel.component.salesforce.apiVersion": {
 			"name": "camel.component.salesforce.apiVersion",
 			"description": "Salesforce API version.",
-			"defaultValue": "\"34.0\"",
+			"defaultValue": "\"50.0\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -555,11 +548,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.salesforce.basicPropertyBinding": {
-			"name": "camel.component.salesforce.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.salesforce.autowiredEnabled": {
+			"name": "camel.component.salesforce.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.salesforce.httpProxyExcludedAddresses": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-source.json
index 826e7bf..425fd94 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-salesforce-source.json
@@ -36,7 +36,7 @@
 		"camel.source.endpoint.apiVersion": {
 			"name": "camel.source.endpoint.apiVersion",
 			"description": "Salesforce API version.",
-			"defaultValue": "\"34.0\"",
+			"defaultValue": "\"50.0\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -274,13 +274,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -309,7 +302,7 @@
 		"camel.component.salesforce.apiVersion": {
 			"name": "camel.component.salesforce.apiVersion",
 			"description": "Salesforce API version.",
-			"defaultValue": "\"34.0\"",
+			"defaultValue": "\"50.0\"",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -573,11 +566,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.salesforce.basicPropertyBinding": {
-			"name": "camel.component.salesforce.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.salesforce.autowiredEnabled": {
+			"name": "camel.component.salesforce.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.salesforce.httpProxyExcludedAddresses": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sap-netweaver-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sap-netweaver-sink.json
index ca58217..1688d99 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sap-netweaver-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sap-netweaver-sink.json
@@ -55,13 +55,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -76,11 +69,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sap-netweaver.basicPropertyBinding": {
-			"name": "camel.component.sap-netweaver.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sap-netweaver.autowiredEnabled": {
+			"name": "camel.component.sap-netweaver.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scheduler-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scheduler-source.json
index 0752e92..dcaf2bb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scheduler-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scheduler-source.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -168,11 +161,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.scheduler.basicPropertyBinding": {
-			"name": "camel.component.scheduler.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.scheduler.autowiredEnabled": {
+			"name": "camel.component.scheduler.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.scheduler.concurrentTasks": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-schematron-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-schematron-sink.json
index c1e5b0c..db713f2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-schematron-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-schematron-sink.json
@@ -35,13 +35,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -62,11 +55,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.schematron.basicPropertyBinding": {
-			"name": "camel.component.schematron.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.schematron.autowiredEnabled": {
+			"name": "camel.component.schematron.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scp-sink.json
index 433bf5f..1993a88 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-scp-sink.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectTimeout": {
 			"name": "camel.sink.endpoint.connectTimeout",
 			"description": "Sets the connect timeout for waiting for a connection to be established Used by both FTPClient and JSCH",
@@ -199,11 +192,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.scp.basicPropertyBinding": {
-			"name": "camel.component.scp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.scp.autowiredEnabled": {
+			"name": "camel.component.scp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-sink.json
index 261ed5b..13db27e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.queue": {
 			"name": "camel.sink.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -124,11 +117,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.seda.basicPropertyBinding": {
-			"name": "camel.component.seda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.seda.autowiredEnabled": {
+			"name": "camel.component.seda.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.seda.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-source.json
index bdcec81..a3318b1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-seda-source.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.queue": {
 			"name": "camel.source.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.seda.basicPropertyBinding": {
-			"name": "camel.component.seda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.seda.autowiredEnabled": {
+			"name": "camel.component.seda.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.seda.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-service-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-service-source.json
index 31e9ca4..08e00c5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-service-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-service-source.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -55,11 +48,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.service.basicPropertyBinding": {
-			"name": "camel.component.service.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.service.autowiredEnabled": {
+			"name": "camel.component.service.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.service.service": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servicenow-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servicenow-sink.json
index be46ca4..1f93d08 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servicenow-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servicenow-sink.json
@@ -176,13 +176,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.dateFormat": {
 			"name": "camel.sink.endpoint.dateFormat",
 			"description": "The date format used for Json serialization\/deserialization",
@@ -469,11 +462,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.servicenow.basicPropertyBinding": {
-			"name": "camel.component.servicenow.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.servicenow.autowiredEnabled": {
+			"name": "camel.component.servicenow.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.servicenow.dateFormat": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servlet-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servlet-source.json
index 5d82525..0771dcb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servlet-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-servlet-source.json
@@ -141,13 +141,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.mapHttpMessageBody": {
 			"name": "camel.source.endpoint.mapHttpMessageBody",
 			"description": "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping.",
@@ -216,11 +209,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.servlet.basicPropertyBinding": {
-			"name": "camel.component.servlet.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.servlet.autowiredEnabled": {
+			"name": "camel.component.servlet.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.servlet.httpBinding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-sink.json
index 3367a98..021b5a7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-sink.json
@@ -187,13 +187,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bindAddress": {
 			"name": "camel.sink.endpoint.bindAddress",
 			"description": "Specifies the address of the local interface against which the connection should bind.",
@@ -385,11 +378,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sftp.basicPropertyBinding": {
-			"name": "camel.component.sftp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sftp.autowiredEnabled": {
+			"name": "camel.component.sftp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-source.json
index d659c28..77c8e89 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sftp-source.json
@@ -218,13 +218,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bindAddress": {
 			"name": "camel.source.endpoint.bindAddress",
 			"description": "Specifies the address of the local interface against which the connection should bind.",
@@ -729,11 +722,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sftp.basicPropertyBinding": {
-			"name": "camel.component.sftp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sftp.autowiredEnabled": {
+			"name": "camel.component.sftp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-sink.json
index 21fbcae..9ac9c2e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-sink.json
@@ -125,13 +125,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.callIdHeader": {
 			"name": "camel.sink.endpoint.callIdHeader",
 			"description": "A custom Header object containing call details. Must implement the type javax.sip.header.CallIdHeader",
@@ -281,11 +274,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sip.basicPropertyBinding": {
-			"name": "camel.component.sip.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sip.autowiredEnabled": {
+			"name": "camel.component.sip.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-source.json
index 15a68a3..232c1a7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sip-source.json
@@ -151,13 +151,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.callIdHeader": {
 			"name": "camel.source.endpoint.callIdHeader",
 			"description": "A custom Header object containing call details. Must implement the type javax.sip.header.CallIdHeader",
@@ -307,11 +300,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sip.basicPropertyBinding": {
-			"name": "camel.component.sip.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sip.autowiredEnabled": {
+			"name": "camel.component.sip.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-sink.json
index b95413b..e29f7b5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-sink.json
@@ -125,13 +125,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.callIdHeader": {
 			"name": "camel.sink.endpoint.callIdHeader",
 			"description": "A custom Header object containing call details. Must implement the type javax.sip.header.CallIdHeader",
@@ -281,11 +274,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sips.basicPropertyBinding": {
-			"name": "camel.component.sips.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sips.autowiredEnabled": {
+			"name": "camel.component.sips.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-source.json
index 5b6d1e4..103d1f6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sips-source.json
@@ -151,13 +151,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.callIdHeader": {
 			"name": "camel.source.endpoint.callIdHeader",
 			"description": "A custom Header object containing call details. Must implement the type javax.sip.header.CallIdHeader",
@@ -307,11 +300,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sips.basicPropertyBinding": {
-			"name": "camel.component.sips.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sips.autowiredEnabled": {
+			"name": "camel.component.sips.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-batch-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-batch-source.json
index 0777847..da84c51 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-batch-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-batch-source.json
@@ -123,13 +123,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -189,11 +182,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms-batch.basicPropertyBinding": {
-			"name": "camel.component.sjms-batch.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sjms-batch.autowiredEnabled": {
+			"name": "camel.component.sjms-batch.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sjms-batch.connectionFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-sink.json
index cb38155..f0d4a25 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-sink.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionCount": {
 			"name": "camel.sink.endpoint.connectionCount",
 			"description": "The maximum number of connections available to this endpoint",
@@ -187,6 +180,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.sjms.connectionFactory": {
+			"name": "camel.component.sjms.connectionFactory",
+			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.sjms.lazyStartProducer": {
 			"name": "camel.component.sjms.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -194,11 +193,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms.basicPropertyBinding": {
-			"name": "camel.component.sjms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sjms.autowiredEnabled": {
+			"name": "camel.component.sjms.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sjms.connectionClientId": {
@@ -207,12 +206,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms.connectionFactory": {
-			"name": "camel.component.sjms.connectionFactory",
-			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.sjms.connectionMaxWait": {
 			"name": "camel.component.sjms.connectionMaxWait",
 			"description": "The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-source.json
index 5eced02..47a98f2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms-source.json
@@ -102,13 +102,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionCount": {
 			"name": "camel.source.endpoint.connectionCount",
 			"description": "The maximum number of connections available to this endpoint",
@@ -226,6 +219,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.sjms.connectionFactory": {
+			"name": "camel.component.sjms.connectionFactory",
+			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.sjms.bridgeErrorHandler": {
 			"name": "camel.component.sjms.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -247,11 +246,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms.basicPropertyBinding": {
-			"name": "camel.component.sjms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sjms.autowiredEnabled": {
+			"name": "camel.component.sjms.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sjms.connectionClientId": {
@@ -260,12 +259,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms.connectionFactory": {
-			"name": "camel.component.sjms.connectionFactory",
-			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.sjms.connectionMaxWait": {
 			"name": "camel.component.sjms.connectionMaxWait",
 			"description": "The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-sink.json
index ec00bbc..356b858 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-sink.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionCount": {
 			"name": "camel.sink.endpoint.connectionCount",
 			"description": "The maximum number of connections available to this endpoint",
@@ -187,6 +180,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.sjms2.connectionFactory": {
+			"name": "camel.component.sjms2.connectionFactory",
+			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.sjms2.lazyStartProducer": {
 			"name": "camel.component.sjms2.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -194,11 +193,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms2.basicPropertyBinding": {
-			"name": "camel.component.sjms2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sjms2.autowiredEnabled": {
+			"name": "camel.component.sjms2.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sjms2.connectionClientId": {
@@ -207,12 +206,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms2.connectionFactory": {
-			"name": "camel.component.sjms2.connectionFactory",
-			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.sjms2.connectionMaxWait": {
 			"name": "camel.component.sjms2.connectionMaxWait",
 			"description": "The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-source.json
index 9d35f22..ddfa500 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sjms2-source.json
@@ -122,13 +122,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionCount": {
 			"name": "camel.source.endpoint.connectionCount",
 			"description": "The maximum number of connections available to this endpoint",
@@ -246,6 +239,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.sjms2.connectionFactory": {
+			"name": "camel.component.sjms2.connectionFactory",
+			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.sjms2.bridgeErrorHandler": {
 			"name": "camel.component.sjms2.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -267,11 +266,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms2.basicPropertyBinding": {
-			"name": "camel.component.sjms2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sjms2.autowiredEnabled": {
+			"name": "camel.component.sjms2.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sjms2.connectionClientId": {
@@ -280,12 +279,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sjms2.connectionFactory": {
-			"name": "camel.component.sjms2.connectionFactory",
-			"description": "A ConnectionFactory is required to enable the SjmsComponent. It can be set directly or set set as part of a ConnectionResource.",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.sjms2.connectionMaxWait": {
 			"name": "camel.component.sjms2.connectionMaxWait",
 			"description": "The max wait time in millis to block and wait on free connection when the pool is exhausted when using the default org.apache.camel.component.sjms.jms.ConnectionFactoryResource.",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
index 1bcdc48..ec51297 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-sink.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -67,11 +60,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.slack.basicPropertyBinding": {
-			"name": "camel.component.slack.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.slack.autowiredEnabled": {
+			"name": "camel.component.slack.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.slack.webhookUrl": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
index cf3a868..b30d70b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-slack-source.json
@@ -67,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -181,11 +174,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.slack.basicPropertyBinding": {
-			"name": "camel.component.slack.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.slack.autowiredEnabled": {
+			"name": "camel.component.slack.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.slack.webhookUrl": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-sink.json
index 2070455..b38c674 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-sink.json
@@ -151,13 +151,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.enquireLinkTimer": {
 			"name": "camel.sink.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
@@ -383,11 +376,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smpp.basicPropertyBinding": {
-			"name": "camel.component.smpp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smpp.autowiredEnabled": {
+			"name": "camel.component.smpp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smpp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-source.json
index ab50c5a..f9461c2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpp-source.json
@@ -82,13 +82,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.enquireLinkTimer": {
 			"name": "camel.source.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
@@ -233,11 +226,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smpp.basicPropertyBinding": {
-			"name": "camel.component.smpp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smpp.autowiredEnabled": {
+			"name": "camel.component.smpp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smpp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-sink.json
index a3ccdcd..406e2fe 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-sink.json
@@ -151,13 +151,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.enquireLinkTimer": {
 			"name": "camel.sink.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
@@ -383,11 +376,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smpps.basicPropertyBinding": {
-			"name": "camel.component.smpps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smpps.autowiredEnabled": {
+			"name": "camel.component.smpps.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smpps.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-source.json
index 85a57e7..238b2db 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smpps-source.json
@@ -82,13 +82,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.enquireLinkTimer": {
 			"name": "camel.source.endpoint.enquireLinkTimer",
 			"description": "Defines the interval in milliseconds between the confidence checks. The confidence check is used to test the communication path between an ESME and an SMSC.",
@@ -233,11 +226,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smpps.basicPropertyBinding": {
-			"name": "camel.component.smpps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smpps.autowiredEnabled": {
+			"name": "camel.component.smpps.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smpps.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-sink.json
index af1b171..ee22226 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -275,11 +268,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smtp.basicPropertyBinding": {
-			"name": "camel.component.smtp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smtp.autowiredEnabled": {
+			"name": "camel.component.smtp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smtp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-source.json
index 6665570..afcdf30 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtp-source.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -528,11 +521,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smtp.basicPropertyBinding": {
-			"name": "camel.component.smtp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smtp.autowiredEnabled": {
+			"name": "camel.component.smtp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smtp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-sink.json
index fde6818..6bc8702 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -275,11 +268,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smtps.basicPropertyBinding": {
-			"name": "camel.component.smtps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smtps.autowiredEnabled": {
+			"name": "camel.component.smtps.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smtps.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-source.json
index 7271817..61a9833 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-smtps-source.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -528,11 +521,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.smtps.basicPropertyBinding": {
-			"name": "camel.component.smtps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.smtps.autowiredEnabled": {
+			"name": "camel.component.smtps.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.smtps.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-sink.json
index 3b920d4..41198c9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-sink.json
@@ -87,13 +87,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -145,11 +138,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.snmp.basicPropertyBinding": {
-			"name": "camel.component.snmp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.snmp.autowiredEnabled": {
+			"name": "camel.component.snmp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-source.json
index 56b664a..13b5175 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-snmp-source.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -270,11 +263,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.snmp.basicPropertyBinding": {
-			"name": "camel.component.snmp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.snmp.autowiredEnabled": {
+			"name": "camel.component.snmp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solr-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solr-sink.json
index 068d0d5..e255ba5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solr-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solr-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.solr.basicPropertyBinding": {
-			"name": "camel.component.solr.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.solr.autowiredEnabled": {
+			"name": "camel.component.solr.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrCloud-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrCloud-sink.json
index abe01f3..743222a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrCloud-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrCloud-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.solrcloud.basicPropertyBinding": {
-			"name": "camel.component.solrcloud.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.solrcloud.autowiredEnabled": {
+			"name": "camel.component.solrcloud.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrs-sink.json
index 6703fe0..b8302c2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-solrs-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.solrs.basicPropertyBinding": {
-			"name": "camel.component.solrs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.solrs.autowiredEnabled": {
+			"name": "camel.component.solrs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-sink.json
index 2f48026..66f6661 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-sink.json
@@ -71,13 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -140,11 +133,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.soroush.basicPropertyBinding": {
-			"name": "camel.component.soroush.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.soroush.autowiredEnabled": {
+			"name": "camel.component.soroush.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.soroush.authorizationToken": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-source.json
index 6544881..7f84f58 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-soroush-source.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -131,11 +124,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.soroush.basicPropertyBinding": {
-			"name": "camel.component.soroush.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.soroush.autowiredEnabled": {
+			"name": "camel.component.soroush.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.soroush.authorizationToken": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spark-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spark-sink.json
index e377585..73728fc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spark-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spark-sink.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -86,11 +79,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spark.basicPropertyBinding": {
-			"name": "camel.component.spark.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spark.autowiredEnabled": {
+			"name": "camel.component.spark.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-hec-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-hec-sink.json
index 92e6e7a..cfbb325 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-hec-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-hec-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -90,11 +83,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.splunk-hec.basicPropertyBinding": {
-			"name": "camel.component.splunk-hec.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.splunk-hec.autowiredEnabled": {
+			"name": "camel.component.splunk-hec.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-sink.json
index 1c0507c..ac73644 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-sink.json
@@ -99,13 +99,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -146,11 +139,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.splunk.basicPropertyBinding": {
-			"name": "camel.component.splunk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.splunk.autowiredEnabled": {
+			"name": "camel.component.splunk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.splunk.splunkConfigurationFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-source.json
index 6784f5e..57f1d9b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-splunk-source.json
@@ -130,13 +130,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -270,11 +263,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.splunk.basicPropertyBinding": {
-			"name": "camel.component.splunk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.splunk.autowiredEnabled": {
+			"name": "camel.component.splunk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.splunk.splunkConfigurationFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-batch-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-batch-sink.json
index bbfba6e..b740e27 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-batch-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-batch-sink.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -74,11 +67,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-batch.basicPropertyBinding": {
-			"name": "camel.component.spring-batch.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-batch.autowiredEnabled": {
+			"name": "camel.component.spring-batch.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-sink.json
index a03ecdb..4db65b0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-event.basicPropertyBinding": {
-			"name": "camel.component.spring-event.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-event.autowiredEnabled": {
+			"name": "camel.component.spring-event.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-source.json
index f87d40d..21bf601 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-event-source.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -55,11 +48,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-event.basicPropertyBinding": {
-			"name": "camel.component.spring-event.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-event.autowiredEnabled": {
+			"name": "camel.component.spring-event.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-sink.json
index 1a77ba4..3fdcc13 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-sink.json
@@ -35,13 +35,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -56,11 +49,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-integration.basicPropertyBinding": {
-			"name": "camel.component.spring-integration.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-integration.autowiredEnabled": {
+			"name": "camel.component.spring-integration.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-source.json
index aa047e5..0d462fd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-integration-source.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -68,11 +61,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-integration.basicPropertyBinding": {
-			"name": "camel.component.spring-integration.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-integration.autowiredEnabled": {
+			"name": "camel.component.spring-integration.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ldap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ldap-sink.json
index 8516168..02b916f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ldap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ldap-sink.json
@@ -35,13 +35,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -56,11 +49,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-ldap.basicPropertyBinding": {
-			"name": "camel.component.spring-ldap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-ldap.autowiredEnabled": {
+			"name": "camel.component.spring-ldap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-sink.json
index 478dc35..8d9298f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -80,11 +73,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-redis.basicPropertyBinding": {
-			"name": "camel.component.spring-redis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-redis.autowiredEnabled": {
+			"name": "camel.component.spring-redis.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-source.json
index 7fd32e6..42d91a5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-redis-source.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-redis.basicPropertyBinding": {
-			"name": "camel.component.spring-redis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-redis.autowiredEnabled": {
+			"name": "camel.component.spring-redis.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-sink.json
index 38181ef..afb5d96 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-sink.json
@@ -108,13 +108,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -135,11 +128,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-ws.basicPropertyBinding": {
-			"name": "camel.component.spring-ws.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-ws.autowiredEnabled": {
+			"name": "camel.component.spring-ws.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.spring-ws.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-source.json
index c168014..69b4616 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-spring-ws-source.json
@@ -70,13 +70,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -97,11 +90,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.spring-ws.basicPropertyBinding": {
-			"name": "camel.component.spring-ws.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.spring-ws.autowiredEnabled": {
+			"name": "camel.component.spring-ws.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.spring-ws.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-sink.json
index f35d3a5..6401a8c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-sink.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.parametersCount": {
 			"name": "camel.sink.endpoint.parametersCount",
 			"description": "If set greater than zero, then Camel will use this count value of parameters to replace instead of querying via JDBC metadata API. This is useful if the JDBC vendor could not return correct parameters count, then user may override instead.",
@@ -154,11 +147,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sql.basicPropertyBinding": {
-			"name": "camel.component.sql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sql.autowiredEnabled": {
+			"name": "camel.component.sql.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sql.usePlaceholder": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-source.json
index 0026b0e..4639366 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-source.json
@@ -164,13 +164,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.parametersCount": {
 			"name": "camel.source.endpoint.parametersCount",
 			"description": "If set greater than zero, then Camel will use this count value of parameters to replace instead of querying via JDBC metadata API. This is useful if the JDBC vendor could not return correct parameters count, then user may override instead.",
@@ -316,11 +309,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sql.basicPropertyBinding": {
-			"name": "camel.component.sql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sql.autowiredEnabled": {
+			"name": "camel.component.sql.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.sql.usePlaceholder": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-stored-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-stored-sink.json
index 35b2bb6..c7f7d7a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-stored-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-sql-stored-sink.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -89,11 +82,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.sql-stored.basicPropertyBinding": {
-			"name": "camel.component.sql-stored.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.sql-stored.autowiredEnabled": {
+			"name": "camel.component.sql-stored.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-sink.json
index 116322d..b603f58 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-sink.json
@@ -49,13 +49,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.channelType": {
 			"name": "camel.sink.endpoint.channelType",
 			"description": "Sets the channel type to pass to the Channel as part of command execution. Defaults to exec.",
@@ -146,11 +139,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ssh.basicPropertyBinding": {
-			"name": "camel.component.ssh.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ssh.autowiredEnabled": {
+			"name": "camel.component.ssh.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ssh.channelType": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json
index 524b915..7ce72c9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json
@@ -80,13 +80,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.channelType": {
 			"name": "camel.source.endpoint.channelType",
 			"description": "Sets the channel type to pass to the Channel as part of command execution. Defaults to exec.",
@@ -276,11 +269,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ssh.basicPropertyBinding": {
-			"name": "camel.component.ssh.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ssh.autowiredEnabled": {
+			"name": "camel.component.ssh.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ssh.channelType": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stax-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stax-sink.json
index dfb4d82..2e225c4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stax-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stax-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stax.basicPropertyBinding": {
-			"name": "camel.component.stax.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stax.autowiredEnabled": {
+			"name": "camel.component.stax.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-sink.json
index 4f995c8..ea05c93 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -117,11 +110,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stomp.basicPropertyBinding": {
-			"name": "camel.component.stomp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stomp.autowiredEnabled": {
+			"name": "camel.component.stomp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.stomp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-source.json
index 2a0f2ab..9b11659 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-source.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stomp.basicPropertyBinding": {
-			"name": "camel.component.stomp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stomp.autowiredEnabled": {
+			"name": "camel.component.stomp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.stomp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-sink.json
index 382f981..645a855 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-sink.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.readTimeout": {
 			"name": "camel.sink.endpoint.readTimeout",
 			"description": "Sets the read timeout to a specified timeout, in milliseconds. A non-zero value specifies the timeout when reading from Input stream when a connection is established to a resource. If the timeout expires before there is data available for read, a java.net.SocketTimeoutException is raised. A timeout of zero is interpreted as an infinite timeout.",
@@ -80,11 +73,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stream.basicPropertyBinding": {
-			"name": "camel.component.stream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stream.autowiredEnabled": {
+			"name": "camel.component.stream.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-source.json
index c6e9faf..18e3ccb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-source.json
@@ -104,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.readTimeout": {
 			"name": "camel.source.endpoint.readTimeout",
 			"description": "Sets the read timeout to a specified timeout, in milliseconds. A non-zero value specifies the timeout when reading from Input stream when a connection is established to a resource. If the timeout expires before there is data available for read, a java.net.SocketTimeoutException is raised. A timeout of zero is interpreted as an infinite timeout.",
@@ -131,11 +124,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stream.basicPropertyBinding": {
-			"name": "camel.component.stream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stream.autowiredEnabled": {
+			"name": "camel.component.stream.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-string-template-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-string-template-sink.json
index 9ad74d7..5ba661d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-string-template-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-string-template-sink.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.string-template.basicPropertyBinding": {
-			"name": "camel.component.string-template.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.string-template.autowiredEnabled": {
+			"name": "camel.component.string-template.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-sink.json
index 61c678f..a96989d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.queue": {
 			"name": "camel.sink.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -124,11 +117,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stub.basicPropertyBinding": {
-			"name": "camel.component.stub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stub.autowiredEnabled": {
+			"name": "camel.component.stub.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.stub.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-source.json
index bc5d0d0..60194ca 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-source.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.queue": {
 			"name": "camel.source.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stub.basicPropertyBinding": {
-			"name": "camel.component.stub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stub.autowiredEnabled": {
+			"name": "camel.component.stub.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.stub.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-sink.json
index 65b14bb..06ffe3a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "The initial in-memory buffer size used when transferring data between Camel and AHC Client.",
@@ -93,6 +86,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.telegram.autowiredEnabled": {
+			"name": "camel.component.telegram.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.telegram.baseUri": {
 			"name": "camel.component.telegram.baseUri",
 			"description": "Can be used to set an alternative base URI, e.g. when you want to test the component against a mock Telegram API",
@@ -100,13 +100,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.telegram.basicPropertyBinding": {
-			"name": "camel.component.telegram.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
-			"required": "false"
-		},
 		"camel.component.telegram.client": {
 			"name": "camel.component.telegram.client",
 			"description": "To use a custom AsyncHttpClient",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-source.json
index 1a8eb7f..8e28cbb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-source.json
@@ -67,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bufferSize": {
 			"name": "camel.source.endpoint.bufferSize",
 			"description": "The initial in-memory buffer size used when transferring data between Camel and AHC Client.",
@@ -219,6 +212,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.telegram.autowiredEnabled": {
+			"name": "camel.component.telegram.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.telegram.baseUri": {
 			"name": "camel.component.telegram.baseUri",
 			"description": "Can be used to set an alternative base URI, e.g. when you want to test the component against a mock Telegram API",
@@ -226,13 +226,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.telegram.basicPropertyBinding": {
-			"name": "camel.component.telegram.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
-			"required": "false"
-		},
 		"camel.component.telegram.client": {
 			"name": "camel.component.telegram.client",
 			"description": "To use a custom AsyncHttpClient",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-sink.json
index da182d4..de612b6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-sink.json
@@ -54,13 +54,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -88,11 +81,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.thrift.basicPropertyBinding": {
-			"name": "camel.component.thrift.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.thrift.autowiredEnabled": {
+			"name": "camel.component.thrift.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.thrift.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-source.json
index c13a210..5424c51 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-source.json
@@ -80,13 +80,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -114,11 +107,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.thrift.basicPropertyBinding": {
-			"name": "camel.component.thrift.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.thrift.autowiredEnabled": {
+			"name": "camel.component.thrift.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.thrift.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-tika-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-tika-sink.json
index adbcd54..97fce81 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-tika-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-tika-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -68,11 +61,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.tika.basicPropertyBinding": {
-			"name": "camel.component.tika.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.tika.autowiredEnabled": {
+			"name": "camel.component.tika.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-timer-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-timer-source.json
index d5fe76e..e10514b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-timer-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-timer-source.json
@@ -69,13 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.daemon": {
 			"name": "camel.source.endpoint.daemon",
 			"description": "Specifies whether or not the thread associated with the timer endpoint runs as a daemon. The default value is true.",
@@ -115,11 +108,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.timer.basicPropertyBinding": {
-			"name": "camel.component.timer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.timer.autowiredEnabled": {
+			"name": "camel.component.timer.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-sink.json
index 76a3b70..efd7909 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twilio.basicPropertyBinding": {
-			"name": "camel.component.twilio.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twilio.autowiredEnabled": {
+			"name": "camel.component.twilio.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twilio.restClient": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-source.json
index 76e1d7a..510d4a3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-source.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -179,11 +172,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twilio.basicPropertyBinding": {
-			"name": "camel.component.twilio.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twilio.autowiredEnabled": {
+			"name": "camel.component.twilio.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twilio.restClient": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-sink.json
index 7a12455..634082d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-directmessage.basicPropertyBinding": {
-			"name": "camel.component.twitter-directmessage.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-directmessage.autowiredEnabled": {
+			"name": "camel.component.twitter-directmessage.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-directmessage.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-source.json
index 885f231..e0b196c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-source.json
@@ -92,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -301,11 +294,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-directmessage.basicPropertyBinding": {
-			"name": "camel.component.twitter-directmessage.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-directmessage.autowiredEnabled": {
+			"name": "camel.component.twitter-directmessage.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-directmessage.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-sink.json
index fb73df2..79cffe0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-search.basicPropertyBinding": {
-			"name": "camel.component.twitter-search.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-search.autowiredEnabled": {
+			"name": "camel.component.twitter-search.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-search.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-source.json
index 8cd3f9f..4b15427 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-source.json
@@ -92,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -301,11 +294,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-search.basicPropertyBinding": {
-			"name": "camel.component.twitter-search.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-search.autowiredEnabled": {
+			"name": "camel.component.twitter-search.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-search.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-sink.json
index 96498d5..0089c6e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -97,11 +90,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-timeline.basicPropertyBinding": {
-			"name": "camel.component.twitter-timeline.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-timeline.autowiredEnabled": {
+			"name": "camel.component.twitter-timeline.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-timeline.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-source.json
index 1725485..88a5b8c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-source.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -307,11 +300,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-timeline.basicPropertyBinding": {
-			"name": "camel.component.twitter-timeline.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-timeline.autowiredEnabled": {
+			"name": "camel.component.twitter-timeline.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-timeline.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-sink.json
index 8705961..f31c59c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-sink.json
@@ -89,13 +89,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -159,11 +152,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.undertow.basicPropertyBinding": {
-			"name": "camel.component.undertow.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.undertow.autowiredEnabled": {
+			"name": "camel.component.undertow.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.undertow.hostOptions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-source.json
index 115124a..e055678 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-source.json
@@ -87,13 +87,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.undertow.basicPropertyBinding": {
-			"name": "camel.component.undertow.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.undertow.autowiredEnabled": {
+			"name": "camel.component.undertow.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.undertow.hostOptions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-validator-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-validator-sink.json
index 872a152..7e37ba2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-validator-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-validator-sink.json
@@ -42,13 +42,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.errorHandler": {
 			"name": "camel.sink.endpoint.errorHandler",
 			"description": "To use a custom org.apache.camel.processor.validation.ValidatorErrorHandler. The default error handler captures the errors and throws an exception.",
@@ -101,11 +94,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.validator.basicPropertyBinding": {
-			"name": "camel.component.validator.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.validator.autowiredEnabled": {
+			"name": "camel.component.validator.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.validator.resourceResolverFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-velocity-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-velocity-sink.json
index 34dff21..81cf1fc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-velocity-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-velocity-sink.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -97,11 +90,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.velocity.basicPropertyBinding": {
-			"name": "camel.component.velocity.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.velocity.autowiredEnabled": {
+			"name": "camel.component.velocity.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.velocity.velocityEngine": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json
index 14647ad..42f2722 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json
@@ -103,13 +103,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -185,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx-http.basicPropertyBinding": {
-			"name": "camel.component.vertx-http.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx-http.autowiredEnabled": {
+			"name": "camel.component.vertx-http.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx-http.vertx": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-sink.json
index 414fc20..b7644f6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -80,11 +73,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx.basicPropertyBinding": {
-			"name": "camel.component.vertx.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx.autowiredEnabled": {
+			"name": "camel.component.vertx.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx.vertxFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-source.json
index f9c4cf0..70f8343 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-source.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx.basicPropertyBinding": {
-			"name": "camel.component.vertx.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx.autowiredEnabled": {
+			"name": "camel.component.vertx.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx.vertxFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
index e1bc267..9da5a2b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
@@ -56,13 +56,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -83,11 +76,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx-websocket.basicPropertyBinding": {
-			"name": "camel.component.vertx-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx-websocket.autowiredEnabled": {
+			"name": "camel.component.vertx-websocket.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx-websocket.router": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-source.json
index 8838c85..f5e6be9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-source.json
@@ -67,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx-websocket.basicPropertyBinding": {
-			"name": "camel.component.vertx-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx-websocket.autowiredEnabled": {
+			"name": "camel.component.vertx-websocket.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx-websocket.router": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-sink.json
index 2a5838b..b950983 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.queue": {
 			"name": "camel.sink.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -124,11 +117,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vm.basicPropertyBinding": {
-			"name": "camel.component.vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vm.autowiredEnabled": {
+			"name": "camel.component.vm.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vm.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-source.json
index e3dfec7..5076ed2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-source.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.queue": {
 			"name": "camel.source.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vm.basicPropertyBinding": {
-			"name": "camel.component.vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vm.autowiredEnabled": {
+			"name": "camel.component.vm.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vm.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-sink.json
index c6e55eb..6a238e1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.geoLocationProvider": {
 			"name": "camel.sink.endpoint.geoLocationProvider",
 			"description": "A custum geolocation provider to determine the longitude and latitude to use when no location information is set. The default implementaion uses the ipstack API and requires geolocationAccessKey and geolocationRequestHostIP",
@@ -165,11 +158,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.weather.basicPropertyBinding": {
-			"name": "camel.component.weather.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.weather.autowiredEnabled": {
+			"name": "camel.component.weather.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-source.json
index a21f9e3..d1fb6c0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-source.json
@@ -91,13 +91,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.geoLocationProvider": {
 			"name": "camel.source.endpoint.geoLocationProvider",
 			"description": "A custum geolocation provider to determine the longitude and latitude to use when no location information is set. The default implementaion uses the ipstack API and requires geolocationAccessKey and geolocationRequestHostIP",
@@ -283,11 +276,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.weather.basicPropertyBinding": {
-			"name": "camel.component.weather.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.weather.autowiredEnabled": {
+			"name": "camel.component.weather.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-sink.json
index c151895..a3068a0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-sink.json
@@ -232,13 +232,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -469,11 +462,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.web3j.basicPropertyBinding": {
-			"name": "camel.component.web3j.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.web3j.autowiredEnabled": {
+			"name": "camel.component.web3j.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-source.json
index deb58d1..5ea34cd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-source.json
@@ -104,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -201,11 +194,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.web3j.basicPropertyBinding": {
-			"name": "camel.component.web3j.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.web3j.autowiredEnabled": {
+			"name": "camel.component.web3j.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-webhook-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-webhook-source.json
index 1a65805..df83565 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-webhook-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-webhook-source.json
@@ -65,13 +65,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -117,11 +110,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.webhook.basicPropertyBinding": {
-			"name": "camel.component.webhook.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.webhook.autowiredEnabled": {
+			"name": "camel.component.webhook.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.webhook.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-sink.json
index 50c6d0c..7e8e7ea 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-sink.json
@@ -29,13 +29,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -50,11 +43,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.websocket-jsr356.basicPropertyBinding": {
-			"name": "camel.component.websocket-jsr356.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.websocket-jsr356.autowiredEnabled": {
+			"name": "camel.component.websocket-jsr356.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.websocket-jsr356.serverEndpointDeploymentStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-source.json
index 4619f49..59d73b4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-source.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -62,11 +55,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.websocket-jsr356.basicPropertyBinding": {
-			"name": "camel.component.websocket-jsr356.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.websocket-jsr356.autowiredEnabled": {
+			"name": "camel.component.websocket-jsr356.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.websocket-jsr356.serverEndpointDeploymentStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-sink.json
index 80713af..059e3ce 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-sink.json
@@ -56,13 +56,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "Set the buffer size of the websocketServlet, which is also the max frame byte size (default 8192)",
@@ -150,11 +143,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.websocket.basicPropertyBinding": {
-			"name": "camel.component.websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.websocket.autowiredEnabled": {
+			"name": "camel.component.websocket.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.websocket.enableJmx": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-source.json
index b6b8aaa..4ebf7b4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-source.json
@@ -68,13 +68,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bufferSize": {
 			"name": "camel.source.endpoint.bufferSize",
 			"description": "Set the buffer size of the websocketServlet, which is also the max frame byte size (default 8192)",
@@ -168,11 +161,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.websocket.basicPropertyBinding": {
-			"name": "camel.component.websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.websocket.autowiredEnabled": {
+			"name": "camel.component.websocket.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.websocket.enableJmx": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weka-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weka-sink.json
index 03bc98f..74c1808 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weka-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weka-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -100,11 +93,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.weka.basicPropertyBinding": {
-			"name": "camel.component.weka.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.weka.autowiredEnabled": {
+			"name": "camel.component.weka.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-sink.json
index b60bd00..e9d214d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -155,11 +148,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.wordpress.basicPropertyBinding": {
-			"name": "camel.component.wordpress.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.wordpress.autowiredEnabled": {
+			"name": "camel.component.wordpress.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-source.json
index 597d35d..09a3494 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-source.json
@@ -90,13 +90,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -167,11 +160,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.wordpress.basicPropertyBinding": {
-			"name": "camel.component.wordpress.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.wordpress.autowiredEnabled": {
+			"name": "camel.component.wordpress.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 7316923..9b381c5 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -60,7 +60,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SinkConnector", model.getConnectorClass());
         assertEquals("camel.sink.path.bucketNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonS3Client", model.getOptions().get(1).getName());
-        assertEquals("camel.sink.endpoint.amazonS3Presigner", model.getOptions().get(2).getName());
+        assertEquals("camel.sink.endpoint.autoCreateBucket", model.getOptions().get(2).getName());
         assertEquals(1, model.getConverters().size());
         assertEquals(1, model.getTransforms().size());
         assertNull(model.getAggregationStrategies());