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

[camel-kafka-connector] branch camel-master updated (4bee264 -> 7602236)

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

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


    from 4bee264  Fixed CamelKafkaConnectorCatalogTest
     new 8d26827  Enanched unit tests for PojoToSchemaAndStructTransform
     new 09491aa  fix #692 : Cache already computed Schemas in PojoToSchemaAndStructTransform.
     new 5465d13  Added Memory Idempotency support for both sink and source
     new bbed72c  Fixed CS
     new 922a823  Use the errorHandler variable coming from Builder
     new 741873a  Idempotency: Lets build the idempotentRepository before and use a reference to it in registry
     new 1b7003f  Fixed CS
     new 032c271  Added Support for KafkaIdempotentRepository
     new f6b983b  Fixed CS
     new 85f54c3  Added documentation for idempotency in basic configuration docs
     new b5bf4a5  Prevent NPEs in the (unlikely) case the record value is null
     new 81c2f32  Fixed wrong config references in both CamelSinkTask and CamelSourceTask
     new d43b657  related to #715: renamed PojoToSchemaAndStructTransform to SourcePojoToSchemaAndStructTransform
     new 270d806  fixed #715: Create the sink counterpart of the PojoToSchemaAndStructTransform.
     new 672cbec  Regen and fixed compilation
     new 363edca  Fixed Test and regen
     new dd12724  Regen
     new 7602236  Fixed catalog test with JDK11

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


Summary of changes:
 .../resources/connectors/camel-activemq-sink.json  |  17 +-
 .../connectors/camel-activemq-source.json          |  17 +-
 .../resources/connectors/camel-ahc-sink.json       |  17 +-
 .../resources/connectors/camel-ahc-ws-sink.json    |  17 +-
 .../resources/connectors/camel-ahc-ws-source.json  |  17 +-
 .../resources/connectors/camel-ahc-wss-sink.json   |  17 +-
 .../resources/connectors/camel-ahc-wss-source.json |  17 +-
 .../resources/connectors/camel-amqp-sink.json      |  17 +-
 .../resources/connectors/camel-amqp-source.json    |  17 +-
 .../resources/connectors/camel-apns-sink.json      |  17 +-
 .../resources/connectors/camel-apns-source.json    |  17 +-
 .../resources/connectors/camel-arangodb-sink.json  |  17 +-
 .../resources/connectors/camel-as2-sink.json       |  17 +-
 .../resources/connectors/camel-as2-source.json     |  17 +-
 .../resources/connectors/camel-asterisk-sink.json  |  17 +-
 .../connectors/camel-asterisk-source.json          |  17 +-
 .../resources/connectors/camel-atlasmap-sink.json  |  19 +-
 .../resources/connectors/camel-atmos-sink.json     |  17 +-
 .../resources/connectors/camel-atmos-source.json   |  17 +-
 .../camel-atmosphere-websocket-sink.json           |  17 +-
 .../camel-atmosphere-websocket-source.json         |  17 +-
 .../resources/connectors/camel-atom-source.json    |  17 +-
 .../connectors/camel-atomix-map-sink.json          |  17 +-
 .../connectors/camel-atomix-map-source.json        |  17 +-
 .../connectors/camel-atomix-messaging-sink.json    |  17 +-
 .../connectors/camel-atomix-messaging-source.json  |  17 +-
 .../connectors/camel-atomix-multimap-sink.json     |  17 +-
 .../connectors/camel-atomix-queue-sink.json        |  17 +-
 .../connectors/camel-atomix-queue-source.json      |  17 +-
 .../connectors/camel-atomix-set-sink.json          |  17 +-
 .../connectors/camel-atomix-set-source.json        |  17 +-
 .../connectors/camel-atomix-value-sink.json        |  17 +-
 .../connectors/camel-atomix-value-source.json      |  17 +-
 .../resources/connectors/camel-avro-sink.json      |  17 +-
 .../resources/connectors/camel-avro-source.json    |  17 +-
 .../resources/connectors/camel-aws-cw-sink.json    |  17 +-
 .../resources/connectors/camel-aws-ddb-sink.json   |  17 +-
 .../connectors/camel-aws-ddbstream-source.json     |  17 +-
 .../resources/connectors/camel-aws-ec2-sink.json   |  17 +-
 .../resources/connectors/camel-aws-ecs-sink.json   |  17 +-
 .../resources/connectors/camel-aws-eks-sink.json   |  17 +-
 .../resources/connectors/camel-aws-iam-sink.json   |  17 +-
 .../camel-aws-kinesis-firehose-sink.json           |  17 +-
 .../connectors/camel-aws-kinesis-sink.json         |  17 +-
 .../connectors/camel-aws-kinesis-source.json       |  17 +-
 .../resources/connectors/camel-aws-kms-sink.json   |  17 +-
 .../connectors/camel-aws-lambda-sink.json          |  21 +-
 .../resources/connectors/camel-aws-mq-sink.json    |  17 +-
 .../resources/connectors/camel-aws-msk-sink.json   |  17 +-
 .../resources/connectors/camel-aws-s3-sink.json    |  17 +-
 .../resources/connectors/camel-aws-s3-source.json  |  17 +-
 .../resources/connectors/camel-aws-sdb-sink.json   |  17 +-
 .../resources/connectors/camel-aws-ses-sink.json   |  17 +-
 .../resources/connectors/camel-aws-sns-sink.json   |  17 +-
 .../resources/connectors/camel-aws-sqs-sink.json   |  17 +-
 .../resources/connectors/camel-aws-sqs-source.json |  17 +-
 .../resources/connectors/camel-aws-swf-sink.json   |  17 +-
 .../resources/connectors/camel-aws-swf-source.json |  17 +-
 .../connectors/camel-aws-translate-sink.json       |  17 +-
 .../connectors/camel-aws2-athena-sink.json         |  31 +--
 .../resources/connectors/camel-aws2-cw-sink.json   |  31 +--
 .../resources/connectors/camel-aws2-ddb-sink.json  |  31 +--
 .../connectors/camel-aws2-ddbstream-source.json    |  31 +--
 .../resources/connectors/camel-aws2-ec2-sink.json  |  31 +--
 .../resources/connectors/camel-aws2-ecs-sink.json  |  31 +--
 .../resources/connectors/camel-aws2-eks-sink.json  |  31 +--
 .../connectors/camel-aws2-eventbridge-sink.json    |  31 +--
 .../resources/connectors/camel-aws2-iam-sink.json  |  31 +--
 .../camel-aws2-kinesis-firehose-sink.json          |  31 +--
 .../connectors/camel-aws2-kinesis-sink.json        |  31 +--
 .../connectors/camel-aws2-kinesis-source.json      |  31 +--
 .../resources/connectors/camel-aws2-kms-sink.json  |  31 +--
 .../connectors/camel-aws2-lambda-sink.json         |  35 +--
 .../resources/connectors/camel-aws2-mq-sink.json   |  31 +--
 .../resources/connectors/camel-aws2-msk-sink.json  |  31 +--
 .../resources/connectors/camel-aws2-s3-sink.json   |  24 +-
 .../resources/connectors/camel-aws2-s3-source.json |  24 +-
 .../resources/connectors/camel-aws2-ses-sink.json  |  31 +--
 .../resources/connectors/camel-aws2-sns-sink.json  |  35 ++-
 .../resources/connectors/camel-aws2-sqs-sink.json  |  39 +---
 .../connectors/camel-aws2-sqs-source.json          |  39 +---
 .../resources/connectors/camel-aws2-sts-sink.json  |  31 +--
 .../connectors/camel-aws2-translate-sink.json      |  31 +--
 .../connectors/camel-azure-blob-sink.json          |  17 +-
 .../connectors/camel-azure-blob-source.json        |  17 +-
 .../connectors/camel-azure-eventhubs-sink.json     |  17 +-
 .../connectors/camel-azure-eventhubs-source.json   |  17 +-
 .../connectors/camel-azure-queue-sink.json         |  17 +-
 .../connectors/camel-azure-queue-source.json       |  17 +-
 .../connectors/camel-azure-storage-blob-sink.json  |  17 +-
 .../camel-azure-storage-blob-source.json           |  17 +-
 .../connectors/camel-azure-storage-queue-sink.json |  17 +-
 .../camel-azure-storage-queue-source.json          |  17 +-
 .../resources/connectors/camel-bean-sink.json      |  17 +-
 .../resources/connectors/camel-beanstalk-sink.json |  17 +-
 .../connectors/camel-beanstalk-source.json         |  17 +-
 .../resources/connectors/camel-box-sink.json       |  17 +-
 .../resources/connectors/camel-box-source.json     |  17 +-
 .../resources/connectors/camel-braintree-sink.json |  17 +-
 .../connectors/camel-caffeine-cache-sink.json      |  17 +-
 .../connectors/camel-caffeine-loadcache-sink.json  |  17 +-
 .../connectors/camel-chatscript-sink.json          |  17 +-
 .../resources/connectors/camel-chunk-sink.json     |  17 +-
 .../resources/connectors/camel-cm-sms-sink.json    |  17 +-
 .../resources/connectors/camel-cmis-sink.json      |  17 +-
 .../resources/connectors/camel-cmis-source.json    |  17 +-
 .../resources/connectors/camel-coap+tcp-sink.json  |  17 +-
 .../connectors/camel-coap+tcp-source.json          |  17 +-
 .../resources/connectors/camel-coap-sink.json      |  17 +-
 .../resources/connectors/camel-coap-source.json    |  17 +-
 .../resources/connectors/camel-coaps+tcp-sink.json |  17 +-
 .../connectors/camel-coaps+tcp-source.json         |  17 +-
 .../resources/connectors/camel-coaps-sink.json     |  17 +-
 .../resources/connectors/camel-coaps-source.json   |  17 +-
 .../resources/connectors/camel-cometd-sink.json    |  17 +-
 .../resources/connectors/camel-cometd-source.json  |  17 +-
 .../resources/connectors/camel-cometds-sink.json   |  17 +-
 .../resources/connectors/camel-cometds-source.json |  17 +-
 .../resources/connectors/camel-consul-sink.json    |  17 +-
 .../resources/connectors/camel-consul-source.json  |  17 +-
 .../connectors/camel-controlbus-sink.json          |  17 +-
 .../resources/connectors/camel-corda-sink.json     |  17 +-
 .../resources/connectors/camel-corda-source.json   |  17 +-
 .../resources/connectors/camel-couchbase-sink.json |  18 +-
 .../connectors/camel-couchbase-source.json         |  25 +-
 .../resources/connectors/camel-couchdb-sink.json   |  17 +-
 .../resources/connectors/camel-couchdb-source.json |  17 +-
 .../resources/connectors/camel-cql-sink.json       |  17 +-
 .../resources/connectors/camel-cql-source.json     |  17 +-
 .../resources/connectors/camel-cron-source.json    |  17 +-
 .../connectors/camel-crypto-cms-sink.json          |  17 +-
 .../resources/connectors/camel-crypto-sink.json    |  17 +-
 .../resources/connectors/camel-cxf-sink.json       |  17 +-
 .../resources/connectors/camel-cxf-source.json     |  17 +-
 .../resources/connectors/camel-cxfrs-sink.json     |  17 +-
 .../resources/connectors/camel-cxfrs-source.json   |  17 +-
 .../connectors/camel-dataformat-sink.json          |  17 +-
 .../resources/connectors/camel-direct-sink.json    |  17 +-
 .../resources/connectors/camel-direct-source.json  |  17 +-
 .../resources/connectors/camel-direct-vm-sink.json |  17 +-
 .../connectors/camel-direct-vm-source.json         |  17 +-
 .../resources/connectors/camel-disruptor-sink.json |  17 +-
 .../connectors/camel-disruptor-source.json         |  17 +-
 .../connectors/camel-disruptor-vm-sink.json        |  17 +-
 .../connectors/camel-disruptor-vm-source.json      |  17 +-
 .../resources/connectors/camel-djl-sink.json       |  17 +-
 .../resources/connectors/camel-dns-sink.json       |  17 +-
 .../resources/connectors/camel-docker-sink.json    |  17 +-
 .../resources/connectors/camel-docker-source.json  |  17 +-
 .../resources/connectors/camel-dozer-sink.json     |  17 +-
 .../resources/connectors/camel-drill-sink.json     |  17 +-
 .../resources/connectors/camel-dropbox-sink.json   |  17 +-
 .../resources/connectors/camel-dropbox-source.json |  17 +-
 .../resources/connectors/camel-ehcache-sink.json   |  17 +-
 .../resources/connectors/camel-ehcache-source.json |  17 +-
 .../connectors/camel-elasticsearch-rest-sink.json  |  17 +-
 .../resources/connectors/camel-elsql-sink.json     |  17 +-
 .../resources/connectors/camel-elsql-source.json   |  17 +-
 .../resources/connectors/camel-etcd-keys-sink.json |  17 +-
 .../connectors/camel-etcd-stats-sink.json          |  17 +-
 .../connectors/camel-etcd-stats-source.json        |  17 +-
 .../connectors/camel-etcd-watch-source.json        |  17 +-
 .../resources/connectors/camel-exec-sink.json      |  17 +-
 .../resources/connectors/camel-facebook-sink.json  |  17 +-
 .../connectors/camel-facebook-source.json          |  17 +-
 .../resources/connectors/camel-fhir-sink.json      |  17 +-
 .../resources/connectors/camel-fhir-source.json    |  17 +-
 .../resources/connectors/camel-file-sink.json      |  17 +-
 .../resources/connectors/camel-file-source.json    |  17 +-
 .../connectors/camel-file-watch-source.json        |  17 +-
 .../resources/connectors/camel-flatpack-sink.json  |  17 +-
 .../connectors/camel-flatpack-source.json          |  17 +-
 .../resources/connectors/camel-flink-sink.json     |  17 +-
 .../resources/connectors/camel-fop-sink.json       |  17 +-
 .../connectors/camel-freemarker-sink.json          |  17 +-
 .../resources/connectors/camel-ftp-sink.json       |  17 +-
 .../resources/connectors/camel-ftp-source.json     |  17 +-
 .../resources/connectors/camel-ftps-sink.json      |  17 +-
 .../resources/connectors/camel-ftps-source.json    |  17 +-
 .../resources/connectors/camel-ganglia-sink.json   |  17 +-
 .../resources/connectors/camel-geocoder-sink.json  |  17 +-
 .../resources/connectors/camel-git-sink.json       |  17 +-
 .../resources/connectors/camel-git-source.json     |  17 +-
 .../resources/connectors/camel-github-sink.json    |  19 +-
 .../resources/connectors/camel-github-source.json  | 125 +++++++++-
 .../connectors/camel-google-bigquery-sink.json     |  21 +-
 .../connectors/camel-google-bigquery-sql-sink.json |  21 +-
 .../connectors/camel-google-calendar-sink.json     |  17 +-
 .../connectors/camel-google-calendar-source.json   |  17 +-
 .../camel-google-calendar-stream-source.json       |  17 +-
 .../connectors/camel-google-drive-sink.json        |  17 +-
 .../connectors/camel-google-drive-source.json      |  17 +-
 .../connectors/camel-google-mail-sink.json         |  17 +-
 .../connectors/camel-google-mail-source.json       |  17 +-
 .../camel-google-mail-stream-source.json           |  17 +-
 .../connectors/camel-google-pubsub-sink.json       |  17 +-
 .../connectors/camel-google-pubsub-source.json     |  17 +-
 .../connectors/camel-google-sheets-sink.json       |  17 +-
 .../connectors/camel-google-sheets-source.json     |  17 +-
 .../camel-google-sheets-stream-source.json         |  17 +-
 .../resources/connectors/camel-gora-sink.json      |  17 +-
 .../resources/connectors/camel-gora-source.json    |  17 +-
 .../resources/connectors/camel-grape-sink.json     |  17 +-
 .../resources/connectors/camel-graphql-sink.json   |  24 +-
 .../resources/connectors/camel-grpc-sink.json      |  17 +-
 .../resources/connectors/camel-grpc-source.json    |  17 +-
 .../connectors/camel-guava-eventbus-sink.json      |  17 +-
 .../connectors/camel-guava-eventbus-source.json    |  17 +-
 .../camel-hazelcast-atomicvalue-sink.json          |  17 +-
 .../camel-hazelcast-instance-source.json           |  17 +-
 .../connectors/camel-hazelcast-list-sink.json      |  17 +-
 .../connectors/camel-hazelcast-list-source.json    |  17 +-
 .../connectors/camel-hazelcast-map-sink.json       |  17 +-
 .../connectors/camel-hazelcast-map-source.json     |  17 +-
 .../connectors/camel-hazelcast-multimap-sink.json  |  17 +-
 .../camel-hazelcast-multimap-source.json           |  17 +-
 .../connectors/camel-hazelcast-queue-sink.json     |  17 +-
 .../connectors/camel-hazelcast-queue-source.json   |  17 +-
 .../camel-hazelcast-replicatedmap-sink.json        |  17 +-
 .../camel-hazelcast-replicatedmap-source.json      |  17 +-
 .../camel-hazelcast-ringbuffer-sink.json           |  17 +-
 .../connectors/camel-hazelcast-seda-sink.json      |  17 +-
 .../connectors/camel-hazelcast-seda-source.json    |  17 +-
 .../connectors/camel-hazelcast-set-sink.json       |  17 +-
 .../connectors/camel-hazelcast-set-source.json     |  17 +-
 .../connectors/camel-hazelcast-topic-sink.json     |  17 +-
 .../connectors/camel-hazelcast-topic-source.json   |  17 +-
 .../resources/connectors/camel-hbase-sink.json     |  17 +-
 .../resources/connectors/camel-hbase-source.json   |  17 +-
 .../resources/connectors/camel-hdfs-sink.json      |  17 +-
 .../resources/connectors/camel-hdfs-source.json    |  17 +-
 .../resources/connectors/camel-http-sink.json      |  17 +-
 .../resources/connectors/camel-https-sink.json     |  17 +-
 .../connectors/camel-iec60870-client-sink.json     |  17 +-
 .../connectors/camel-iec60870-client-source.json   |  17 +-
 .../connectors/camel-iec60870-server-sink.json     |  17 +-
 .../connectors/camel-iec60870-server-source.json   |  17 +-
 .../connectors/camel-ignite-cache-sink.json        |  17 +-
 .../connectors/camel-ignite-cache-source.json      |  17 +-
 .../connectors/camel-ignite-compute-sink.json      |  17 +-
 .../connectors/camel-ignite-events-source.json     |  17 +-
 .../connectors/camel-ignite-idgen-sink.json        |  17 +-
 .../connectors/camel-ignite-messaging-sink.json    |  17 +-
 .../connectors/camel-ignite-messaging-source.json  |  17 +-
 .../connectors/camel-ignite-queue-sink.json        |  17 +-
 .../connectors/camel-ignite-set-sink.json          |  17 +-
 .../resources/connectors/camel-imap-sink.json      |  17 +-
 .../resources/connectors/camel-imap-source.json    |  17 +-
 .../resources/connectors/camel-imaps-sink.json     |  17 +-
 .../resources/connectors/camel-imaps-source.json   |  17 +-
 .../connectors/camel-infinispan-sink.json          |  17 +-
 .../connectors/camel-infinispan-source.json        |  17 +-
 .../resources/connectors/camel-influxdb-sink.json  |  17 +-
 .../resources/connectors/camel-iota-sink.json      |  17 +-
 .../resources/connectors/camel-ipfs-sink.json      |  17 +-
 .../resources/connectors/camel-irc-sink.json       |  17 +-
 .../resources/connectors/camel-irc-source.json     |  17 +-
 .../resources/connectors/camel-ironmq-sink.json    |  17 +-
 .../resources/connectors/camel-ironmq-source.json  |  17 +-
 .../resources/connectors/camel-jbpm-sink.json      |  17 +-
 .../resources/connectors/camel-jbpm-source.json    |  17 +-
 .../resources/connectors/camel-jcache-sink.json    |  17 +-
 .../resources/connectors/camel-jcache-source.json  |  17 +-
 .../resources/connectors/camel-jclouds-sink.json   |  17 +-
 .../resources/connectors/camel-jclouds-source.json |  17 +-
 .../resources/connectors/camel-jcr-sink.json       |  17 +-
 .../resources/connectors/camel-jcr-source.json     |  17 +-
 .../resources/connectors/camel-jdbc-sink.json      |  17 +-
 .../resources/connectors/camel-jetty-source.json   |  31 +--
 .../connectors/camel-jgroups-raft-sink.json        |  17 +-
 .../connectors/camel-jgroups-raft-source.json      |  17 +-
 .../resources/connectors/camel-jgroups-sink.json   |  17 +-
 .../resources/connectors/camel-jgroups-source.json |  17 +-
 .../resources/connectors/camel-jing-sink.json      |  17 +-
 .../resources/connectors/camel-jira-sink.json      |  17 +-
 .../resources/connectors/camel-jira-source.json    |  17 +-
 .../resources/connectors/camel-jms-sink.json       |  17 +-
 .../resources/connectors/camel-jms-source.json     |  17 +-
 .../resources/connectors/camel-jmx-source.json     |  17 +-
 .../resources/connectors/camel-jolt-sink.json      |  17 +-
 .../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 +-
 .../generated/resources/camel-aws2-s3-sink.json    |  24 +-
 .../generated/resources/camel-aws2-s3-source.json  |  24 +-
 .../docs/camel-aws2-s3-kafka-sink-connector.adoc   |   8 +-
 .../docs/camel-aws2-s3-kafka-source-connector.adoc |   8 +-
 .../aws2s3/CamelAws2s3SinkConnectorConfig.java     |  24 +-
 .../aws2s3/CamelAws2s3SourceConnectorConfig.java   |  24 +-
 .../generated/resources/camel-aws2-sns-sink.json   |   8 +-
 .../docs/camel-aws2-sns-kafka-sink-connector.adoc  |   4 +-
 .../aws2sns/CamelAws2snsSinkConnectorConfig.java   |  16 +-
 .../generated/resources/camel-aws2-sqs-sink.json   |   8 +-
 .../generated/resources/camel-aws2-sqs-source.json |   8 +-
 .../docs/camel-aws2-sqs-kafka-sink-connector.adoc  |   4 +-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |   4 +-
 .../aws2sqs/CamelAws2sqsSinkConnectorConfig.java   |  16 +-
 .../aws2sqs/CamelAws2sqsSourceConnectorConfig.java |  16 +-
 .../ftp/transformers/FtpRemoteFileTransforms.java  |   4 +-
 .../transformers/FtpsRemoteFileTransforms.java     |   6 +-
 .../generated/resources/camel-graphql-sink.json    |   7 +
 .../docs/camel-graphql-kafka-sink-connector.adoc   |   3 +-
 .../graphql/CamelGraphqlSinkConnectorConfig.java   |   4 +
 .../generated/resources/camel-salesforce-sink.json |   4 +-
 .../resources/camel-salesforce-source.json         |   4 +-
 .../camel-salesforce-kafka-sink-connector.adoc     |   4 +-
 .../camel-salesforce-kafka-source-connector.adoc   |   4 +-
 .../CamelSalesforceSinkConnectorConfig.java        |   4 +-
 .../CamelSalesforceSourceConnectorConfig.java      |   4 +-
 .../transformers/SftpRemoteFileTransforms.java     |   6 +-
 .../slack/transformers/SlackTransforms.java        |   6 +-
 core/pom.xml                                       |   4 +
 .../camel/kafkaconnector/CamelConnectorConfig.java |  28 +++
 .../kafkaconnector/CamelSinkConnectorConfig.java   |  11 +-
 .../apache/camel/kafkaconnector/CamelSinkTask.java |  15 ++
 .../kafkaconnector/CamelSourceConnectorConfig.java |  11 +-
 .../camel/kafkaconnector/CamelSourceTask.java      |  20 +-
 .../transforms/PojoToSchemaAndStructTransform.java |  96 --------
 .../SinkPojoToSchemaAndStructTransform.java        | 118 ++++++++++
 .../SourcePojoToSchemaAndStructTransform.java      | 138 +++++++++++
 .../utils/CamelKafkaConnectMain.java               | 111 ++++++++-
 .../camel/kafkaconnector/CamelSinkTaskTest.java    | 171 ++++++++++++++
 .../camel/kafkaconnector/CamelSourceTaskTest.java  |  90 ++++++-
 .../PojoToSchemaAndStructTransformTest.java        | 117 ----------
 .../kafkaconnector/transforms/PojoWithMap.java     |  21 +-
 .../SinkPojoToSchemaAndStructTransformTest.java    | 129 ++++++++++
 .../kafkaconnector/transforms/SlackMessage.java    | 259 +++++++++++++++++++++
 .../SourcePojoToSchemaAndStructTransformTest.java  | 171 ++++++++++++++
 docs/modules/ROOT/pages/basic-configuration.adoc   |  14 ++
 .../camel-aws2-s3-kafka-sink-connector.adoc        |   8 +-
 .../camel-aws2-s3-kafka-source-connector.adoc      |   8 +-
 .../camel-aws2-sns-kafka-sink-connector.adoc       |   4 +-
 .../camel-aws2-sqs-kafka-sink-connector.adoc       |   4 +-
 .../camel-aws2-sqs-kafka-source-connector.adoc     |   4 +-
 .../camel-graphql-kafka-sink-connector.adoc        |   3 +-
 .../camel-salesforce-kafka-sink-connector.adoc     |   4 +-
 .../camel-salesforce-kafka-source-connector.adoc   |   4 +-
 560 files changed, 4236 insertions(+), 6767 deletions(-)
 delete mode 100644 core/src/main/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransform.java
 create mode 100644 core/src/main/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java
 create mode 100644 core/src/main/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransform.java
 delete mode 100644 core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransformTest.java
 copy tests/itests-mongodb/src/test/java/org/apache/camel/kafkaconnector/mongodb/services/RemoteMongoDBService.java => core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoWithMap.java (67%)
 create mode 100644 core/src/test/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransformTest.java
 create mode 100644 core/src/test/java/org/apache/camel/kafkaconnector/transforms/SlackMessage.java
 create mode 100644 core/src/test/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransformTest.java


[camel-kafka-connector] 07/18: Fixed CS

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

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

commit 1b7003fe4004b69f653b45206072406acea9c5af
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 19 07:29:03 2020 +0100

    Fixed CS
---
 .../org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index 1627a8d..bebe4a9 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -178,8 +178,8 @@ public class CamelKafkaConnectMain extends SimpleMain {
             
             // Instantianting the idempotent Repository here and inject it in registry to be referenced
             if (idempotencyEnabled) {
-            	IdempotentRepository idempotentRepo = MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension);
-            	camelMain.getCamelContext().getRegistry().bind("idempotentRepository", idempotentRepo);
+                IdempotentRepository idempotentRepo = MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension);
+                camelMain.getCamelContext().getRegistry().bind("idempotentRepository", idempotentRepo);
             }
 
             //creating the actual route


[camel-kafka-connector] 06/18: Idempotency: Lets build the idempotentRepository before and use a reference to it in registry

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

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

commit 741873aa2977274446d8d29a6983dd57eef6d790
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 19 07:24:02 2020 +0100

    Idempotency: Lets build the idempotentRepository before and use a reference to it in registry
---
 .../camel/kafkaconnector/utils/CamelKafkaConnectMain.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index acc97ca..1627a8d 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -28,6 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.kafkaconnector.CamelConnectorConfig;
 import org.apache.camel.main.SimpleMain;
 import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.spi.IdempotentRepository;
 import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.util.ObjectHelper;
@@ -174,6 +175,12 @@ public class CamelKafkaConnectMain extends SimpleMain {
 
             LOG.info("Setting initial properties in Camel context: [{}]", camelProperties);
             camelMain.setInitialProperties(camelProperties);
+            
+            // Instantianting the idempotent Repository here and inject it in registry to be referenced
+            if (idempotencyEnabled) {
+            	IdempotentRepository idempotentRepo = MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension);
+            	camelMain.getCamelContext().getRegistry().bind("idempotentRepository", idempotentRepo);
+            }
 
             //creating the actual route
             camelMain.configure().addRoutesBuilder(new RouteBuilder() {
@@ -213,14 +220,14 @@ public class CamelKafkaConnectMain extends SimpleMain {
                                     LOG.info(".aggregate({}).constant(true).completionSize({}).completionTimeout({}).idempotentConsumer(body(), + "
                                            + "MemoryIdempotentRepository.memoryIdempotentRepository({}))", s, aggregationSize, aggregationTimeout, memoryDimension);
                                     LOG.info(".to({})", to);
-                                    rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
+                                    rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).idempotentConsumer(body()).messageIdRepositoryRef("idempotentRepository").toD(to);
                                     break;
                                 case "header":
                                     LOG.info(".aggregate({}).constant(true).completionSize({}).completionTimeout({}).idempotentConsumer(header(expressionHeader), + "
                                            + "MemoryIdempotentRepository.memoryIdempotentRepository({}))", s, aggregationSize, aggregationTimeout, memoryDimension);
                                     LOG.info(".to({})", to);
                                     rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout)
-                                        .idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
+                                        .idempotentConsumer(header(expressionHeader)).messageIdRepositoryRef("idempotentRepository").toD(to);
                                     break;
                                 default:
                                     break;
@@ -235,11 +242,11 @@ public class CamelKafkaConnectMain extends SimpleMain {
                             switch (expressionType) {
                                 case "body":
                                     LOG.info("idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository({})).to({})", memoryDimension, to);
-                                    rd.idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
+                                    rd.idempotentConsumer(body()).messageIdRepositoryRef("idempotentRepository").toD(to);
                                     break;
                                 case "header":
                                     LOG.info("idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository({})).to({})", memoryDimension, to);
-                                    rd.idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
+                                    rd.idempotentConsumer(header(expressionHeader)).messageIdRepositoryRef("idempotentRepository").toD(to);
                                     break;
                                 default:
                                     break;


[camel-kafka-connector] 09/18: Fixed CS

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

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

commit f6b983b3f14ee3d110f1c252832fda173b7d5ec1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 19 18:38:35 2020 +0100

    Fixed CS
---
 .../org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index 8f95655..c926bbc 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -203,8 +203,8 @@ public class CamelKafkaConnectMain extends SimpleMain {
                         idempotentRepo = MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension);
                         break;
                     case "kafka":
-                	    idempotentRepo = new KafkaIdempotentRepository(idempotentRepositoryTopicName, idempotentRepositoryKafkaServers);
-                	    break;
+                        idempotentRepo = new KafkaIdempotentRepository(idempotentRepositoryTopicName, idempotentRepositoryKafkaServers);
+                        break;
                     default:
                         break;
                 }


[camel-kafka-connector] 14/18: fixed #715: Create the sink counterpart of the PojoToSchemaAndStructTransform.

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

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

commit 270d8067d945ca775eefd7dfdb2424ec56e18279
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Sun Nov 22 23:27:44 2020 +0100

    fixed #715: Create the sink counterpart of the PojoToSchemaAndStructTransform.
---
 .../SinkPojoToSchemaAndStructTransform.java        | 118 ++++++++++
 .../SourcePojoToSchemaAndStructTransform.java      |   2 +-
 .../camel/kafkaconnector/CamelSourceTaskTest.java  |   2 +-
 .../kafkaconnector/transforms/PojoWithMap.java     |  36 +++
 .../SinkPojoToSchemaAndStructTransformTest.java    | 129 ++++++++++
 .../kafkaconnector/transforms/SlackMessage.java    | 259 +++++++++++++++++++++
 .../SourcePojoToSchemaAndStructTransformTest.java  |  19 +-
 7 files changed, 545 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java
new file mode 100644
index 0000000..30ef9ca
--- /dev/null
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.transforms;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Map;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.dataformat.avro.AvroFactory;
+import com.fasterxml.jackson.dataformat.avro.AvroSchema;
+import io.apicurio.registry.utils.converter.avro.AvroData;
+import io.apicurio.registry.utils.converter.avro.AvroDataConfig;
+import org.apache.avro.generic.GenericDatumWriter;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.io.Encoder;
+import org.apache.avro.io.EncoderFactory;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.ConnectRecord;
+import org.apache.kafka.connect.data.Schema;
+import org.apache.kafka.connect.errors.ConnectException;
+import org.apache.kafka.connect.transforms.Transformation;
+import org.apache.kafka.connect.transforms.util.SimpleConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+
+public class SinkPojoToSchemaAndStructTransform<R extends ConnectRecord<R>> implements Transformation<R> {
+    public static final String CAMEL_TRANSFORMER_SINK_POJO_CLASS_PROPERTY = "camel.transformer.sink.pojo.class";
+
+    private static final Logger LOG = LoggerFactory.getLogger(SinkPojoToSchemaAndStructTransform.class);
+
+    private static final ObjectMapper MAPPER = new ObjectMapper(new AvroFactory());
+    private static final String CAMEL_TRANSFORMER_SINK_POJO_CLASS_DOC = "Full qualified class name of the pojo you want your record value converted to";
+    private static final Object CAMEL_TRANSFORMER_SINK_POJO_CLASS_DEFAULT = ConfigDef.NO_DEFAULT_VALUE;
+    private static final ConfigDef CONFIG_DEF = (new ConfigDef()).define(CAMEL_TRANSFORMER_SINK_POJO_CLASS_PROPERTY, ConfigDef.Type.STRING, CAMEL_TRANSFORMER_SINK_POJO_CLASS_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_TRANSFORMER_SINK_POJO_CLASS_DOC);
+
+    private String pojoClass;
+    private ObjectReader objectReader;
+    private AvroData avroData;
+
+
+    @Override
+    public R apply(R r) {
+        LOG.debug("Incoming record: {}", r);
+
+        if (r.value() != null && r.valueSchema() != null && Schema.Type.STRUCT.equals(r.valueSchema().type())) {
+            GenericRecord avroGenericRecord = (GenericRecord)avroData.fromConnectData(r.valueSchema(), r.value());
+
+            LOG.debug("GenericRecord created: {} \nwith schema: {}", avroGenericRecord, avroGenericRecord == null ? "null" : avroGenericRecord.getClass().getName());
+
+            GenericDatumWriter<GenericRecord> writer = new GenericDatumWriter<GenericRecord>(avroGenericRecord.getSchema());
+
+            Object pojo;
+            try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+                Encoder encoder = EncoderFactory.get().binaryEncoder(out, null);
+                writer.write(avroGenericRecord, encoder);
+                encoder.flush();
+
+                byte[] avroData = out.toByteArray();
+                out.close();
+                pojo = objectReader
+                        .with(new AvroSchema(avroGenericRecord.getSchema()))
+                        .readValue(avroData);
+                LOG.debug("Pojo of class {} created: {}", pojo.getClass(), pojo);
+            } catch (IOException e) {
+                throw new ConnectException("Error in generating POJO from Struct.", e);
+            }
+
+            LOG.debug("Generate pojo: {}", pojo);
+            return r.newRecord(r.topic(), r.kafkaPartition(), r.keySchema(), r.key(),
+                    null, pojo, r.timestamp());
+        } else {
+            LOG.debug("Incoming record with a null value or a value schema != Schema.Type.STRUCT, nothing to be done.");
+            return r;
+        }
+    }
+
+    @Override
+    public ConfigDef config() {
+        return CONFIG_DEF;
+    }
+
+    @Override
+    public void close() {
+        //NOOP
+    }
+
+    @Override
+    public void configure(Map<String, ?> configs) {
+        SimpleConfig config = new SimpleConfig(CONFIG_DEF, configs);
+        this.pojoClass = config.getString(CAMEL_TRANSFORMER_SINK_POJO_CLASS_PROPERTY);
+
+        this.avroData = new AvroData(new AvroDataConfig(configs));
+
+        try {
+            this.objectReader = MAPPER.readerFor(Class.forName(pojoClass));
+        } catch (ClassNotFoundException e) {
+            throw new ConnectException("Unable to initialize SinkPojoToSchemaAndStructTransform ", e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransform.java b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransform.java
index 6f0f850..128de09 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransform.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransform.java
@@ -55,7 +55,7 @@ public class SourcePojoToSchemaAndStructTransform<R extends ConnectRecord<R>> im
         LOG.debug("Incoming record: {}", r);
 
         if (r.value() != null) {
-            String recordClassCanonicalName = r.value().getClass().getCanonicalName();
+            String recordClassCanonicalName = r.value().getClass().getName();
             CacheEntry cacheEntry = avroSchemaWrapperCache.computeIfAbsent(recordClassCanonicalName, new Function<String, CacheEntry>() {
                 @Override
                 public CacheEntry apply(String s) {
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
index c6fa7eb..49bf878 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
@@ -295,7 +295,7 @@ public class CamelSourceTaskTest {
         assertEquals(1, results.size());
         Header bigDecimalHeader = results.get(0).headers().allWithName(CamelSourceTask.HEADER_CAMEL_PREFIX + "bigdecimal").next();
         assertEquals("[B", bigDecimalHeader.value().getClass().getName());
-        assertEquals(Decimal.class.getCanonicalName(), bigDecimalHeader.schema().name());
+        assertEquals(Decimal.class.getName(), bigDecimalHeader.schema().name());
         assertEquals(Schema.Type.BYTES, bigDecimalHeader.schema().type());
 
         sourceTask.stop();
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoWithMap.java b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoWithMap.java
new file mode 100644
index 0000000..9511a55
--- /dev/null
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoWithMap.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.transforms;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PojoWithMap {
+    private Map<String, Integer> map = new HashMap<>();
+
+    public Map<String, Integer> getMap() {
+        return map;
+    }
+
+    public void setMap(Map<String, Integer> map) {
+        this.map = map;
+    }
+
+    public void addToMap(String key, Integer value) {
+        map.put(key, value);
+    }
+}
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransformTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransformTest.java
new file mode 100644
index 0000000..5f1655a
--- /dev/null
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransformTest.java
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.transforms;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Map;
+
+import org.apache.camel.kafkaconnector.transforms.SlackMessage.Attachment;
+import org.apache.kafka.connect.connector.ConnectRecord;
+import org.apache.kafka.connect.data.Schema;
+import org.apache.kafka.connect.source.SourceRecord;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SinkPojoToSchemaAndStructTransformTest {
+
+    @Test
+    public void testRecordValueConversion() {
+        SourcePojoToSchemaAndStructTransform sourcePojoToSchemaAndStructTransform = new SourcePojoToSchemaAndStructTransform();
+        sourcePojoToSchemaAndStructTransform.configure(Collections.emptyMap());
+
+        SlackMessage sm = new SlackMessage();
+
+        Attachment at1 = new Attachment();
+        Attachment.Field at1f1 = new Attachment.Field();
+        at1f1.setTitle("ciao");
+        at1f1.setShortValue(true);
+        at1.setFields(new ArrayList<Attachment.Field>(Collections.singleton(at1f1)));
+        at1.setAuthorName("Andrea");
+
+        Attachment at2 = new Attachment();
+        at2.setColor("green");
+
+        ArrayList<Attachment> attachments = new ArrayList<>();
+        attachments.add(at1);
+        attachments.add(at2);
+
+        sm.setText("text");
+        sm.setAttachments(attachments);
+
+        ConnectRecord cr = sourcePojoToSchemaAndStructTransform.apply(
+                new SourceRecord(null, null, "testTopic",
+                Schema.STRING_SCHEMA, "testKeyValue",
+                Schema.BYTES_SCHEMA, sm));
+
+        SinkPojoToSchemaAndStructTransform sinkPojoToSchemaAndStructTransform = new SinkPojoToSchemaAndStructTransform();
+        sinkPojoToSchemaAndStructTransform.configure(Collections.singletonMap(SinkPojoToSchemaAndStructTransform.CAMEL_TRANSFORMER_SINK_POJO_CLASS_PROPERTY, SlackMessage.class.getName()));
+
+        ConnectRecord transformedCr = sinkPojoToSchemaAndStructTransform.apply(cr);
+
+        assertEquals("testTopic", transformedCr.topic());
+        assertEquals(Schema.STRING_SCHEMA, transformedCr.keySchema());
+        assertEquals("testKeyValue", transformedCr.key());
+        assertEquals(SlackMessage.class.getName(), transformedCr.value().getClass().getName());
+        SlackMessage transformedSM = (SlackMessage)transformedCr.value();
+        assertEquals(sm.getText(), transformedSM.getText());
+        assertEquals(sm.getAttachments().size(), transformedSM.getAttachments().size());
+    }
+
+    @Test
+    public void testMapValueConversion() {
+        SourcePojoToSchemaAndStructTransform sourcePojoToSchemaAndStructTransform = new SourcePojoToSchemaAndStructTransform();
+        sourcePojoToSchemaAndStructTransform.configure(Collections.emptyMap());
+
+        PojoWithMap pwm = new PojoWithMap();
+        pwm.addToMap("ciao", 9);
+
+        ConnectRecord cr = sourcePojoToSchemaAndStructTransform.apply(new SourceRecord(null, null, "testTopic",
+                Schema.STRING_SCHEMA, "testKeyValue",
+                Schema.BYTES_SCHEMA, pwm));
+
+        SinkPojoToSchemaAndStructTransform sinkPojoToSchemaAndStructTransform = new SinkPojoToSchemaAndStructTransform();
+        sinkPojoToSchemaAndStructTransform.configure(Collections.singletonMap(SinkPojoToSchemaAndStructTransform.CAMEL_TRANSFORMER_SINK_POJO_CLASS_PROPERTY, PojoWithMap.class.getName()));
+
+        ConnectRecord transformedCr = sinkPojoToSchemaAndStructTransform.apply(cr);
+
+        assertEquals("testTopic", transformedCr.topic());
+        assertEquals(Schema.STRING_SCHEMA, transformedCr.keySchema());
+        assertEquals("testKeyValue", transformedCr.key());
+
+        assertEquals(PojoWithMap.class.getName(), transformedCr.value().getClass().getName());
+        PojoWithMap transformedPWM = (PojoWithMap)transformedCr.value();
+        assertEquals(pwm.getMap().size(), transformedPWM.getMap().size());
+        assertEquals(pwm.getMap().keySet(), transformedPWM.getMap().keySet());
+    }
+
+    @Test()
+    public void testNotStructSchemaConversion() {
+        SinkPojoToSchemaAndStructTransform sinkPojoToSchemaAndStructTransform = new SinkPojoToSchemaAndStructTransform();
+        sinkPojoToSchemaAndStructTransform.configure(Collections.singletonMap(SinkPojoToSchemaAndStructTransform.CAMEL_TRANSFORMER_SINK_POJO_CLASS_PROPERTY, PojoWithMap.class.getName()));
+
+        Map map = Collections.singletonMap("ciao", 9);
+
+        ConnectRecord cr = new SourceRecord(null, null, "testTopic",
+                Schema.STRING_SCHEMA, "testKeyValue",
+                null, map);
+
+        sinkPojoToSchemaAndStructTransform.apply(cr);
+    }
+
+    @Test()
+    public void testNullValueConversion() {
+        SinkPojoToSchemaAndStructTransform sinkPojoToSchemaAndStructTransform = new SinkPojoToSchemaAndStructTransform();
+        sinkPojoToSchemaAndStructTransform.configure(Collections.singletonMap(SinkPojoToSchemaAndStructTransform.CAMEL_TRANSFORMER_SINK_POJO_CLASS_PROPERTY, PojoWithMap.class.getName()));
+
+        ConnectRecord cr = new SourceRecord(null, null, "testTopic",
+                Schema.STRING_SCHEMA, "testKeyValue",
+                Schema.BYTES_SCHEMA, null);
+
+        ConnectRecord transformedCr = sinkPojoToSchemaAndStructTransform.apply(cr);
+        assertEquals(cr, transformedCr);
+    }
+}
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SlackMessage.java b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SlackMessage.java
new file mode 100644
index 0000000..24fa125
--- /dev/null
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SlackMessage.java
@@ -0,0 +1,259 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.kafkaconnector.transforms;
+
+import java.util.List;
+
+//XXX: this class can be removed and tests updated accordingly after Camel updated to 3.7.0
+public class SlackMessage {
+
+    private String text;
+    private String channel;
+    private String username;
+    private String user;
+    private String iconUrl;
+    private String iconEmoji;
+    private List<Attachment> attachments;
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getChannel() {
+        return channel;
+    }
+
+    public void setChannel(String channel) {
+        this.channel = channel;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public String getIconUrl() {
+        return iconUrl;
+    }
+
+    public void setIconUrl(String iconUrl) {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconEmoji() {
+        return iconEmoji;
+    }
+
+    public void setIconEmoji(String iconEmoji) {
+        this.iconEmoji = iconEmoji;
+    }
+
+    public List<Attachment> getAttachments() {
+        return attachments;
+    }
+
+    public void setAttachments(List<Attachment> attachments) {
+        this.attachments = attachments;
+    }
+
+    public static class Attachment {
+
+        private String fallback;
+        private String color;
+        private String pretext;
+        private String authorName;
+        private String authorLink;
+        private String authorIcon;
+        private String title;
+        private String titleLink;
+        private String text;
+        private String imageUrl;
+        private String thumbUrl;
+        private String footer;
+        private String footerIcon;
+        private Long ts;
+        private List<Attachment.Field> fields;
+
+        public String getFallback() {
+            return fallback;
+        }
+
+        public void setFallback(String fallback) {
+            this.fallback = fallback;
+        }
+
+        public String getColor() {
+            return color;
+        }
+
+        public void setColor(String color) {
+            this.color = color;
+        }
+
+        public String getPretext() {
+            return pretext;
+        }
+
+        public void setPretext(String pretext) {
+            this.pretext = pretext;
+        }
+
+        public String getAuthorName() {
+            return authorName;
+        }
+
+        public void setAuthorName(String authorName) {
+            this.authorName = authorName;
+        }
+
+        public String getAuthorLink() {
+            return authorLink;
+        }
+
+        public void setAuthorLink(String authorLink) {
+            this.authorLink = authorLink;
+        }
+
+        public String getAuthorIcon() {
+            return authorIcon;
+        }
+
+        public void setAuthorIcon(String authorIcon) {
+            this.authorIcon = authorIcon;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public String getTitleLink() {
+            return titleLink;
+        }
+
+        public void setTitleLink(String titleLink) {
+            this.titleLink = titleLink;
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        public void setText(String text) {
+            this.text = text;
+        }
+
+        public String getImageUrl() {
+            return imageUrl;
+        }
+
+        public void setImageUrl(String imageUrl) {
+            this.imageUrl = imageUrl;
+        }
+
+        public String getThumbUrl() {
+            return thumbUrl;
+        }
+
+        public void setThumbUrl(String thumbUrl) {
+            this.thumbUrl = thumbUrl;
+        }
+
+        public String getFooter() {
+            return footer;
+        }
+
+        public void setFooter(String footer) {
+            this.footer = footer;
+        }
+
+        public String getFooterIcon() {
+            return footerIcon;
+        }
+
+        public void setFooterIcon(String footerIcon) {
+            this.footerIcon = footerIcon;
+        }
+
+        public Long getTs() {
+            return ts;
+        }
+
+        public void setTs(Long ts) {
+            this.ts = ts;
+        }
+
+        public List<Attachment.Field> getFields() {
+            return fields;
+        }
+
+        public void setFields(List<Attachment.Field> fields) {
+            this.fields = fields;
+        }
+
+        public static class Field {
+
+            private String title;
+            private String value;
+            private Boolean shortValue;
+
+            public String getTitle() {
+                return title;
+            }
+
+            public void setTitle(String title) {
+                this.title = title;
+            }
+
+            public String getValue() {
+                return value;
+            }
+
+            public void setValue(String value) {
+                this.value = value;
+            }
+
+            public Boolean isShortValue() {
+                return shortValue;
+            }
+
+            public void setShortValue(Boolean shortValue) {
+                this.shortValue = shortValue;
+            }
+        }
+    }
+
+}
+
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransformTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransformTest.java
index 529c45f..dfe1ed6 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransformTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransformTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.kafkaconnector.transforms;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -157,7 +156,7 @@ public class SourcePojoToSchemaAndStructTransformTest {
         assertEquals(1, sourcePojoToSchemaAndStructTransform.getCache().keySet().size());
         ConnectRecord transformedCr = sourcePojoToSchemaAndStructTransform.apply(cr);
         assertEquals(1, sourcePojoToSchemaAndStructTransform.getCache().keySet().size());
-        assertTrue(sourcePojoToSchemaAndStructTransform.getCache().keySet().contains(PojoWithMap.class.getCanonicalName()));
+        assertTrue(sourcePojoToSchemaAndStructTransform.getCache().keySet().contains(PojoWithMap.class.getName()));
     }
 
     private void atLeastOneFieldWithGivenValueExists(List structs, String fieldName, String fieldExpectedValue) {
@@ -167,20 +166,4 @@ public class SourcePojoToSchemaAndStructTransformTest {
             struct -> assertEquals(fieldExpectedValue, ((Struct) struct).getString(fieldName))
         );
     }
-
-    public class PojoWithMap {
-        private Map<String, Integer> map = new HashMap<>();
-
-        public Map<String, Integer> getMap() {
-            return map;
-        }
-
-        public void setMap(Map<String, Integer> map) {
-            this.map = map;
-        }
-
-        public void addToMap(String key, Integer value) {
-            map.put(key, value);
-        }
-    }
 }


[camel-kafka-connector] 13/18: related to #715: renamed PojoToSchemaAndStructTransform to SourcePojoToSchemaAndStructTransform

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

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

commit d43b657730c6852bb0f7b56ba4a8ab607ad1143f
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue Nov 17 17:13:35 2020 +0100

    related to #715: renamed PojoToSchemaAndStructTransform to SourcePojoToSchemaAndStructTransform
---
 ...a => SourcePojoToSchemaAndStructTransform.java} |  4 +--
 ... SourcePojoToSchemaAndStructTransformTest.java} | 42 +++++++++++-----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransform.java b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransform.java
similarity index 96%
rename from core/src/main/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransform.java
rename to core/src/main/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransform.java
index 1ecf48f..6f0f850 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransform.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransform.java
@@ -43,8 +43,8 @@ import org.apache.kafka.connect.transforms.Transformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class PojoToSchemaAndStructTransform <R extends ConnectRecord<R>> implements Transformation<R> {
-    private static final Logger LOG = LoggerFactory.getLogger(PojoToSchemaAndStructTransform.class);
+public class SourcePojoToSchemaAndStructTransform<R extends ConnectRecord<R>> implements Transformation<R> {
+    private static final Logger LOG = LoggerFactory.getLogger(SourcePojoToSchemaAndStructTransform.class);
     private static final ObjectMapper MAPPER = new ObjectMapper(new AvroFactory());
 
     private AvroData avroData;
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransformTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransformTest.java
similarity index 76%
rename from core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransformTest.java
rename to core/src/test/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransformTest.java
index e378eab..529c45f 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransformTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/SourcePojoToSchemaAndStructTransformTest.java
@@ -34,12 +34,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class PojoToSchemaAndStructTransformTest {
+public class SourcePojoToSchemaAndStructTransformTest {
 
     @Test
     public void testRecordValueConversion() {
-        PojoToSchemaAndStructTransform pojoToSchemaAndStructTransform = new PojoToSchemaAndStructTransform();
-        pojoToSchemaAndStructTransform.configure(Collections.emptyMap());
+        SourcePojoToSchemaAndStructTransform sourcePojoToSchemaAndStructTransform = new SourcePojoToSchemaAndStructTransform();
+        sourcePojoToSchemaAndStructTransform.configure(Collections.emptyMap());
 
         SlackMessage sm = new SlackMessage();
 
@@ -63,7 +63,7 @@ public class PojoToSchemaAndStructTransformTest {
                 Schema.STRING_SCHEMA, "testKeyValue",
                 Schema.BYTES_SCHEMA, sm);
 
-        ConnectRecord transformedCr = pojoToSchemaAndStructTransform.apply(cr);
+        ConnectRecord transformedCr = sourcePojoToSchemaAndStructTransform.apply(cr);
 
         assertEquals("testTopic", transformedCr.topic());
         assertEquals(Schema.STRING_SCHEMA, transformedCr.keySchema());
@@ -85,8 +85,8 @@ public class PojoToSchemaAndStructTransformTest {
 
     @Test
     public void testMapValueConversion() {
-        PojoToSchemaAndStructTransform pojoToSchemaAndStructTransform = new PojoToSchemaAndStructTransform();
-        pojoToSchemaAndStructTransform.configure(Collections.emptyMap());
+        SourcePojoToSchemaAndStructTransform sourcePojoToSchemaAndStructTransform = new SourcePojoToSchemaAndStructTransform();
+        sourcePojoToSchemaAndStructTransform.configure(Collections.emptyMap());
 
         PojoWithMap pwm = new PojoWithMap();
         pwm.addToMap("ciao", 9);
@@ -95,7 +95,7 @@ public class PojoToSchemaAndStructTransformTest {
                 Schema.STRING_SCHEMA, "testKeyValue",
                 Schema.BYTES_SCHEMA, pwm);
 
-        ConnectRecord transformedCr = pojoToSchemaAndStructTransform.apply(cr);
+        ConnectRecord transformedCr = sourcePojoToSchemaAndStructTransform.apply(cr);
 
         assertEquals("testTopic", transformedCr.topic());
         assertEquals(Schema.STRING_SCHEMA, transformedCr.keySchema());
@@ -113,8 +113,8 @@ public class PojoToSchemaAndStructTransformTest {
 
     @Test()
     public void testNotPojoConversion() {
-        PojoToSchemaAndStructTransform pojoToSchemaAndStructTransform = new PojoToSchemaAndStructTransform();
-        pojoToSchemaAndStructTransform.configure(Collections.emptyMap());
+        SourcePojoToSchemaAndStructTransform sourcePojoToSchemaAndStructTransform = new SourcePojoToSchemaAndStructTransform();
+        sourcePojoToSchemaAndStructTransform.configure(Collections.emptyMap());
 
         Map map = Collections.singletonMap("ciao", 9);
 
@@ -123,27 +123,27 @@ public class PojoToSchemaAndStructTransformTest {
                 Schema.BYTES_SCHEMA, map);
 
         assertThrows(ConnectException.class, () -> {
-            pojoToSchemaAndStructTransform.apply(cr);
+            sourcePojoToSchemaAndStructTransform.apply(cr);
         });
     }
 
     @Test()
     public void testNullValueConversion() {
-        PojoToSchemaAndStructTransform pojoToSchemaAndStructTransform = new PojoToSchemaAndStructTransform();
-        pojoToSchemaAndStructTransform.configure(Collections.emptyMap());
+        SourcePojoToSchemaAndStructTransform sourcePojoToSchemaAndStructTransform = new SourcePojoToSchemaAndStructTransform();
+        sourcePojoToSchemaAndStructTransform.configure(Collections.emptyMap());
 
         ConnectRecord cr = new SourceRecord(null, null, "testTopic",
                 Schema.STRING_SCHEMA, "testKeyValue",
                 Schema.BYTES_SCHEMA, null);
 
-        ConnectRecord transformedCr = pojoToSchemaAndStructTransform.apply(cr);
+        ConnectRecord transformedCr = sourcePojoToSchemaAndStructTransform.apply(cr);
         assertEquals(cr, transformedCr);
     }
 
     @Test()
     public void testConversionCache() {
-        PojoToSchemaAndStructTransform pojoToSchemaAndStructTransform = new PojoToSchemaAndStructTransform();
-        pojoToSchemaAndStructTransform.configure(Collections.emptyMap());
+        SourcePojoToSchemaAndStructTransform sourcePojoToSchemaAndStructTransform = new SourcePojoToSchemaAndStructTransform();
+        sourcePojoToSchemaAndStructTransform.configure(Collections.emptyMap());
 
         PojoWithMap pwm = new PojoWithMap();
         pwm.addToMap("ciao", 9);
@@ -152,12 +152,12 @@ public class PojoToSchemaAndStructTransformTest {
                 Schema.STRING_SCHEMA, "testKeyValue",
                 Schema.BYTES_SCHEMA, pwm);
 
-        assertEquals(0, pojoToSchemaAndStructTransform.getCache().keySet().size());
-        pojoToSchemaAndStructTransform.apply(cr);
-        assertEquals(1, pojoToSchemaAndStructTransform.getCache().keySet().size());
-        ConnectRecord transformedCr = pojoToSchemaAndStructTransform.apply(cr);
-        assertEquals(1, pojoToSchemaAndStructTransform.getCache().keySet().size());
-        assertTrue(pojoToSchemaAndStructTransform.getCache().keySet().contains(PojoWithMap.class.getCanonicalName()));
+        assertEquals(0, sourcePojoToSchemaAndStructTransform.getCache().keySet().size());
+        sourcePojoToSchemaAndStructTransform.apply(cr);
+        assertEquals(1, sourcePojoToSchemaAndStructTransform.getCache().keySet().size());
+        ConnectRecord transformedCr = sourcePojoToSchemaAndStructTransform.apply(cr);
+        assertEquals(1, sourcePojoToSchemaAndStructTransform.getCache().keySet().size());
+        assertTrue(sourcePojoToSchemaAndStructTransform.getCache().keySet().contains(PojoWithMap.class.getCanonicalName()));
     }
 
     private void atLeastOneFieldWithGivenValueExists(List structs, String fieldName, String fieldExpectedValue) {


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

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

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

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

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

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-sink.json
index 16ae0b7..384a98f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-sink.json
@@ -261,13 +261,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.destinationResolver": {
 			"name": "camel.sink.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -760,11 +753,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.activemq.basicPropertyBinding": {
-			"name": "camel.component.activemq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.activemq.autowiredEnabled": {
+			"name": "camel.component.activemq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.activemq.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-source.json
index 239fd28..b4688db 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-activemq-source.json
@@ -247,13 +247,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.destinationResolver": {
 			"name": "camel.source.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -734,11 +727,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.activemq.basicPropertyBinding": {
-			"name": "camel.component.activemq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.activemq.autowiredEnabled": {
+			"name": "camel.component.activemq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.activemq.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-sink.json
index e895fc2..7390159 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-sink.json
@@ -69,13 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -127,11 +120,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc.basicPropertyBinding": {
-			"name": "camel.component.ahc.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc.autowiredEnabled": {
+			"name": "camel.component.ahc.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc.binding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-sink.json
index 34731ca..ef5573c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-sink.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -134,11 +127,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-ws.basicPropertyBinding": {
-			"name": "camel.component.ahc-ws.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-ws.autowiredEnabled": {
+			"name": "camel.component.ahc-ws.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-ws.binding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-source.json
index 3ae9a95..b68bf77 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-ws-source.json
@@ -75,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -133,11 +126,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-ws.basicPropertyBinding": {
-			"name": "camel.component.ahc-ws.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-ws.autowiredEnabled": {
+			"name": "camel.component.ahc-ws.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-ws.binding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-sink.json
index 63cbb60..e4fea62 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-sink.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -134,11 +127,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-wss.basicPropertyBinding": {
-			"name": "camel.component.ahc-wss.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-wss.autowiredEnabled": {
+			"name": "camel.component.ahc-wss.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-wss.binding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-source.json
index 40c1d8a..270adac 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ahc-wss-source.json
@@ -75,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -133,11 +126,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-wss.basicPropertyBinding": {
-			"name": "camel.component.ahc-wss.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-wss.autowiredEnabled": {
+			"name": "camel.component.ahc-wss.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-wss.binding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-sink.json
index d49cf73..a72d743 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-sink.json
@@ -261,13 +261,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.destinationResolver": {
 			"name": "camel.sink.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -747,11 +740,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.amqp.basicPropertyBinding": {
-			"name": "camel.component.amqp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.amqp.autowiredEnabled": {
+			"name": "camel.component.amqp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.amqp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-source.json
index cc16650..c3feb3a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-amqp-source.json
@@ -247,13 +247,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.destinationResolver": {
 			"name": "camel.source.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -721,11 +714,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.amqp.basicPropertyBinding": {
-			"name": "camel.component.amqp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.amqp.autowiredEnabled": {
+			"name": "camel.component.amqp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.amqp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-sink.json
index 2ebea02..ec84d66 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -55,11 +48,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.apns.basicPropertyBinding": {
-			"name": "camel.component.apns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.apns.autowiredEnabled": {
+			"name": "camel.component.apns.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-source.json
index 8e59414..d8e7156 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-apns-source.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -173,11 +166,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.apns.basicPropertyBinding": {
-			"name": "camel.component.apns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.apns.autowiredEnabled": {
+			"name": "camel.component.apns.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-arangodb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-arangodb-sink.json
index 08f33d9..8d71970 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-arangodb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-arangodb-sink.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -145,11 +138,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.arangodb.basicPropertyBinding": {
-			"name": "camel.component.arangodb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.arangodb.autowiredEnabled": {
+			"name": "camel.component.arangodb.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.arangodb.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-sink.json
index 52cc0ca..506fbff 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-sink.json
@@ -196,13 +196,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -217,11 +210,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.as2.basicPropertyBinding": {
-			"name": "camel.component.as2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.as2.autowiredEnabled": {
+			"name": "camel.component.as2.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.as2.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-source.json
index 5097d1e..207f25c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-as2-source.json
@@ -201,13 +201,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -222,11 +215,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.as2.basicPropertyBinding": {
-			"name": "camel.component.as2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.as2.autowiredEnabled": {
+			"name": "camel.component.as2.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.as2.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-sink.json
index 5ffe733..e46bf0c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-sink.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -67,11 +60,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.asterisk.basicPropertyBinding": {
-			"name": "camel.component.asterisk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.asterisk.autowiredEnabled": {
+			"name": "camel.component.asterisk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-source.json
index b68ffef..bb38c15 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-asterisk-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.asterisk.basicPropertyBinding": {
-			"name": "camel.component.asterisk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.asterisk.autowiredEnabled": {
+			"name": "camel.component.asterisk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atlasmap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atlasmap-sink.json
index 5bf8f40..db58112 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atlasmap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atlasmap-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.propertiesFile": {
 			"name": "camel.sink.endpoint.propertiesFile",
 			"description": "The URI of the properties file which is used for AtlasContextFactory initialization.",
@@ -88,12 +81,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atlasmap.basicPropertyBinding": {
-			"name": "camel.component.atlasmap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atlasmap.autowiredEnabled": {
+			"name": "camel.component.atlasmap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-sink.json
index 76aa2e7..a9ba8c9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-sink.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmos.basicPropertyBinding": {
-			"name": "camel.component.atmos.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmos.autowiredEnabled": {
+			"name": "camel.component.atmos.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmos.uri": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-source.json
index d16116c..ea5638b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmos-source.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmos.basicPropertyBinding": {
-			"name": "camel.component.atmos.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmos.autowiredEnabled": {
+			"name": "camel.component.atmos.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmos.uri": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-sink.json
index 471c142..cec8c98 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-sink.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.mapHttpMessageBody": {
 			"name": "camel.sink.endpoint.mapHttpMessageBody",
 			"description": "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping.",
@@ -125,11 +118,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmosphere-websocket.basicPropertyBinding": {
-			"name": "camel.component.atmosphere-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmosphere-websocket.autowiredEnabled": {
+			"name": "camel.component.atmosphere-websocket.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmosphere-websocket.httpBinding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-source.json
index 6980b7d..52ac73b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atmosphere-websocket-source.json
@@ -155,13 +155,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.mapHttpMessageBody": {
 			"name": "camel.source.endpoint.mapHttpMessageBody",
 			"description": "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping.",
@@ -230,11 +223,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmosphere-websocket.basicPropertyBinding": {
-			"name": "camel.component.atmosphere-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmosphere-websocket.autowiredEnabled": {
+			"name": "camel.component.atmosphere-websocket.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmosphere-websocket.httpBinding": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atom-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atom-source.json
index b759d6d..a690664 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atom-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atom-source.json
@@ -100,13 +100,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -214,11 +207,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atom.basicPropertyBinding": {
-			"name": "camel.component.atom.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atom.autowiredEnabled": {
+			"name": "camel.component.atom.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-sink.json
index a003fd5..65f5bfb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-sink.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-map.basicPropertyBinding": {
-			"name": "camel.component.atomix-map.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-map.autowiredEnabled": {
+			"name": "camel.component.atomix-map.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-map.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-source.json
index 929a1db..2d54881 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-map-source.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -198,11 +191,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-map.basicPropertyBinding": {
-			"name": "camel.component.atomix-map.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-map.autowiredEnabled": {
+			"name": "camel.component.atomix-map.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-map.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-sink.json
index 1e252ff..570b8df 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-sink.json
@@ -79,13 +79,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -200,11 +193,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-messaging.basicPropertyBinding": {
-			"name": "camel.component.atomix-messaging.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-messaging.autowiredEnabled": {
+			"name": "camel.component.atomix-messaging.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-messaging.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-source.json
index 8db866d..7f16975 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-messaging-source.json
@@ -91,13 +91,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -212,11 +205,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-messaging.basicPropertyBinding": {
-			"name": "camel.component.atomix-messaging.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-messaging.autowiredEnabled": {
+			"name": "camel.component.atomix-messaging.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-messaging.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-multimap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-multimap-sink.json
index 81ffc22..3b6e3b7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-multimap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-multimap-sink.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-multimap.basicPropertyBinding": {
-			"name": "camel.component.atomix-multimap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-multimap.autowiredEnabled": {
+			"name": "camel.component.atomix-multimap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-multimap.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-sink.json
index ad929a3..46bf77f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -162,11 +155,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-queue.basicPropertyBinding": {
-			"name": "camel.component.atomix-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-queue.autowiredEnabled": {
+			"name": "camel.component.atomix-queue.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-queue.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-source.json
index fd1c961..db3757b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-queue-source.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -174,11 +167,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-queue.basicPropertyBinding": {
-			"name": "camel.component.atomix-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-queue.autowiredEnabled": {
+			"name": "camel.component.atomix-queue.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-queue.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-sink.json
index 43c8814..fd759f5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -174,11 +167,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-set.basicPropertyBinding": {
-			"name": "camel.component.atomix-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-set.autowiredEnabled": {
+			"name": "camel.component.atomix-set.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-set.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-source.json
index 2b1c264..52fd093 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-set-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-set.basicPropertyBinding": {
-			"name": "camel.component.atomix-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-set.autowiredEnabled": {
+			"name": "camel.component.atomix-set.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-set.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-sink.json
index caa6fec..e661b78 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -174,11 +167,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-value.basicPropertyBinding": {
-			"name": "camel.component.atomix-value.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-value.autowiredEnabled": {
+			"name": "camel.component.atomix-value.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-value.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-source.json
index 6fc8726..4c45c3a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-atomix-value-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-value.basicPropertyBinding": {
-			"name": "camel.component.atomix-value.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-value.autowiredEnabled": {
+			"name": "camel.component.atomix-value.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-value.defaultResourceConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-sink.json
index ec3209f..fc86f1e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,11 +130,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.avro.basicPropertyBinding": {
-			"name": "camel.component.avro.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.avro.autowiredEnabled": {
+			"name": "camel.component.avro.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.avro.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-source.json
index 0d60fc9..4494919 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-avro-source.json
@@ -90,13 +90,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -149,11 +142,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.avro.basicPropertyBinding": {
-			"name": "camel.component.avro.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.avro.autowiredEnabled": {
+			"name": "camel.component.avro.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.avro.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cw-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cw-sink.json
index 793e21f..8c612d1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cw-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-cw-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -185,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-cw.basicPropertyBinding": {
-			"name": "camel.component.aws-cw.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-cw.autowiredEnabled": {
+			"name": "camel.component.aws-cw.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-cw.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink.json
index 4b5b1d1..408e5d3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddb-sink.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -213,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ddb.basicPropertyBinding": {
-			"name": "camel.component.aws-ddb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ddb.autowiredEnabled": {
+			"name": "camel.component.aws-ddb.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-ddb.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddbstream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddbstream-source.json
index 4d82a94..a5fd1bf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddbstream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ddbstream-source.json
@@ -104,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -293,11 +286,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ddbstream.basicPropertyBinding": {
-			"name": "camel.component.aws-ddbstream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ddbstream.autowiredEnabled": {
+			"name": "camel.component.aws-ddbstream.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-ddbstream.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink.json
index dfc8181..9f8e241 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ec2-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ec2.basicPropertyBinding": {
-			"name": "camel.component.aws-ec2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ec2.autowiredEnabled": {
+			"name": "camel.component.aws-ec2.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ecs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ecs-sink.json
index b8386f7..aeaca5c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ecs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ecs-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ecs.basicPropertyBinding": {
-			"name": "camel.component.aws-ecs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ecs.autowiredEnabled": {
+			"name": "camel.component.aws-ecs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-eks-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-eks-sink.json
index e75535d..13c143a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-eks-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-eks-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-eks.basicPropertyBinding": {
-			"name": "camel.component.aws-eks.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-eks.autowiredEnabled": {
+			"name": "camel.component.aws-eks.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-iam-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-iam-sink.json
index 4e31313..5142ace 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-iam-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-iam-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-iam.basicPropertyBinding": {
-			"name": "camel.component.aws-iam.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-iam.autowiredEnabled": {
+			"name": "camel.component.aws-iam.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink.json
index b6ca7a8..9f4cb23 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-firehose-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,11 +130,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kinesis-firehose.basicPropertyBinding": {
-			"name": "camel.component.aws-kinesis-firehose.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kinesis-firehose.autowiredEnabled": {
+			"name": "camel.component.aws-kinesis-firehose.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-kinesis-firehose.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink.json
index 15df906..48e1f19 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,11 +130,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kinesis.basicPropertyBinding": {
-			"name": "camel.component.aws-kinesis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kinesis.autowiredEnabled": {
+			"name": "camel.component.aws-kinesis.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-kinesis.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source.json
index 25b1050..2d6e9a0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kinesis-source.json
@@ -118,13 +118,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -321,11 +314,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kinesis.basicPropertyBinding": {
-			"name": "camel.component.aws-kinesis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kinesis.autowiredEnabled": {
+			"name": "camel.component.aws-kinesis.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-kinesis.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kms-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kms-sink.json
index c9cd26c..221f341 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kms-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-kms-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kms.basicPropertyBinding": {
-			"name": "camel.component.aws-kms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kms.autowiredEnabled": {
+			"name": "camel.component.aws-kms.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink.json
index 7531787..6aa4ab4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-lambda-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -126,19 +119,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws-lambda.autowiredEnabled": {
+			"name": "camel.component.aws-lambda.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws-lambda.awsLambdaClient": {
 			"name": "camel.component.aws-lambda.awsLambdaClient",
 			"description": "To use a existing configured AwsLambdaClient as client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-lambda.basicPropertyBinding": {
-			"name": "camel.component.aws-lambda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
-			"required": "false"
-		},
 		"camel.component.aws-lambda.proxyHost": {
 			"name": "camel.component.aws-lambda.proxyHost",
 			"description": "To define a proxy host when instantiating the Lambda client",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-mq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-mq-sink.json
index 4791c5a..e800afa 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-mq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-mq-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-mq.basicPropertyBinding": {
-			"name": "camel.component.aws-mq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-mq.autowiredEnabled": {
+			"name": "camel.component.aws-mq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-msk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-msk-sink.json
index b82d2de..be4d8c2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-msk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-msk-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-msk.basicPropertyBinding": {
-			"name": "camel.component.aws-msk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-msk.autowiredEnabled": {
+			"name": "camel.component.aws-msk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink.json
index e4dcdbf..493c281 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-sink.json
@@ -199,13 +199,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -415,11 +408,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-s3.basicPropertyBinding": {
-			"name": "camel.component.aws-s3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-s3.autowiredEnabled": {
+			"name": "camel.component.aws-s3.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-s3.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-source.json
index 7a17688..4fb886c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-s3-source.json
@@ -219,13 +219,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -509,11 +502,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-s3.basicPropertyBinding": {
-			"name": "camel.component.aws-s3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-s3.autowiredEnabled": {
+			"name": "camel.component.aws-s3.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-s3.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sdb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sdb-sink.json
index 0e037a9..1fd578d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sdb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sdb-sink.json
@@ -85,13 +85,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,11 +99,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sdb.basicPropertyBinding": {
-			"name": "camel.component.aws-sdb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sdb.autowiredEnabled": {
+			"name": "camel.component.aws-sdb.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink.json
index 019edf5..e3e50c0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-ses-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -185,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ses.basicPropertyBinding": {
-			"name": "camel.component.aws-ses.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ses.autowiredEnabled": {
+			"name": "camel.component.aws-ses.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-ses.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink.json
index ba2b1da..e28ce47 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sns-sink.json
@@ -123,13 +123,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -257,11 +250,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sns.basicPropertyBinding": {
-			"name": "camel.component.aws-sns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sns.autowiredEnabled": {
+			"name": "camel.component.aws-sns.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-sns.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink.json
index e9e19a8..acaebde 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-sink.json
@@ -106,13 +106,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.delayQueue": {
 			"name": "camel.sink.endpoint.delayQueue",
 			"description": "Define if you want to apply delaySeconds option to the queue or on single messages",
@@ -278,11 +271,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sqs.basicPropertyBinding": {
-			"name": "camel.component.aws-sqs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sqs.autowiredEnabled": {
+			"name": "camel.component.aws-sqs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-sqs.delayQueue": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source.json
index 5ecb585..2aa2267 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-sqs-source.json
@@ -189,13 +189,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.delayQueue": {
 			"name": "camel.source.endpoint.delayQueue",
 			"description": "Define if you want to apply delaySeconds option to the queue or on single messages",
@@ -506,11 +499,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sqs.basicPropertyBinding": {
-			"name": "camel.component.aws-sqs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sqs.autowiredEnabled": {
+			"name": "camel.component.aws-sqs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-sqs.delayQueue": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-sink.json
index 9787bf1..a29a544 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-sink.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientConfigurationParameters": {
 			"name": "camel.sink.endpoint.clientConfigurationParameters",
 			"description": "To configure the ClientConfiguration using the key\/values from the Map.",
@@ -214,11 +207,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-swf.basicPropertyBinding": {
-			"name": "camel.component.aws-swf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-swf.autowiredEnabled": {
+			"name": "camel.component.aws-swf.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-swf.clientConfigurationParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-source.json
index 96f1cea..6ae4000 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-swf-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.clientConfigurationParameters": {
 			"name": "camel.source.endpoint.clientConfigurationParameters",
 			"description": "To configure the ClientConfiguration using the key\/values from the Map.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-swf.basicPropertyBinding": {
-			"name": "camel.component.aws-swf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-swf.autowiredEnabled": {
+			"name": "camel.component.aws-swf.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-swf.clientConfigurationParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-translate-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-translate-sink.json
index 7f4e66b..6bac73f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-translate-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws-translate-sink.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -201,11 +194,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-translate.basicPropertyBinding": {
-			"name": "camel.component.aws-translate.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-translate.autowiredEnabled": {
+			"name": "camel.component.aws-translate.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-athena-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-athena-sink.json
index a1e1013..b6315b8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-athena-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-athena-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key.",
@@ -189,13 +182,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientRequestToken": {
 			"name": "camel.sink.endpoint.clientRequestToken",
 			"description": "A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this.",
@@ -221,13 +207,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-athena.autoDiscoverClient": {
-			"name": "camel.component.aws2-athena.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-athena.configuration": {
 			"name": "camel.component.aws2-athena.configuration",
 			"description": "The component configuration.",
@@ -389,11 +368,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-athena.basicPropertyBinding": {
-			"name": "camel.component.aws2-athena.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-athena.autowiredEnabled": {
+			"name": "camel.component.aws2-athena.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-athena.clientRequestToken": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json
index 656469a..10f93b9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-cw-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -91,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -123,13 +109,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-cw.autoDiscoverClient": {
-			"name": "camel.component.aws2-cw.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-cw.configuration": {
 			"name": "camel.component.aws2-cw.configuration",
 			"description": "The component configuration",
@@ -199,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-cw.basicPropertyBinding": {
-			"name": "camel.component.aws2-cw.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-cw.autowiredEnabled": {
+			"name": "camel.component.aws2-cw.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-cw.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json
index 062950f..237b751 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddb-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.consistentRead": {
 			"name": "camel.sink.endpoint.consistentRead",
 			"description": "Determines whether or not strong consistency should be enforced when data is read.",
@@ -105,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,13 +123,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddb.autoDiscoverClient": {
-			"name": "camel.component.aws2-ddb.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ddb.configuration": {
 			"name": "camel.component.aws2-ddb.configuration",
 			"description": "The component configuration",
@@ -227,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddb.basicPropertyBinding": {
-			"name": "camel.component.aws2-ddb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ddb.autowiredEnabled": {
+			"name": "camel.component.aws2-ddb.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-ddb.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
index fcf834d..3a6f737 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ddbstream-source.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.source.endpoint.autoDiscoverClient": {
-			"name": "camel.source.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.amazonDynamoDbStreamsClient": {
 			"name": "camel.source.endpoint.amazonDynamoDbStreamsClient",
 			"description": "Amazon DynamoDB client to use for all requests for this endpoint",
@@ -111,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -230,13 +216,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.autoDiscoverClient": {
-			"name": "camel.component.aws2-ddbstream.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ddbstream.amazonDynamoDbStreamsClient": {
 			"name": "camel.component.aws2-ddbstream.amazonDynamoDbStreamsClient",
 			"description": "Amazon DynamoDB client to use for all requests for this endpoint",
@@ -307,11 +286,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.basicPropertyBinding": {
-			"name": "camel.component.aws2-ddbstream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ddbstream.autowiredEnabled": {
+			"name": "camel.component.aws2-ddbstream.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-ddbstream.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json
index d11bcff..f547ded 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ec2-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -92,13 +85,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ec2.autoDiscoverClient": {
-			"name": "camel.component.aws2-ec2.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ec2.accessKey": {
 			"name": "camel.component.aws2-ec2.accessKey",
 			"description": "Amazon AWS Access Key",
@@ -189,11 +168,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ec2.basicPropertyBinding": {
-			"name": "camel.component.aws2-ec2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ec2.autowiredEnabled": {
+			"name": "camel.component.aws2-ec2.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json
index 0287c57..cc45888 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ecs-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.ecsClient": {
 			"name": "camel.sink.endpoint.ecsClient",
 			"description": "To use a existing configured AWS ECS as client",
@@ -80,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ecs.autoDiscoverClient": {
-			"name": "camel.component.aws2-ecs.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ecs.configuration": {
 			"name": "camel.component.aws2-ecs.configuration",
 			"description": "Component configuration",
@@ -177,11 +156,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ecs.basicPropertyBinding": {
-			"name": "camel.component.aws2-ecs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ecs.autowiredEnabled": {
+			"name": "camel.component.aws2-ecs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-ecs.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json
index bfc70b5..56e9715 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eks-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.eksClient": {
 			"name": "camel.sink.endpoint.eksClient",
 			"description": "To use a existing configured AWS EKS as client",
@@ -80,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-eks.autoDiscoverClient": {
-			"name": "camel.component.aws2-eks.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-eks.configuration": {
 			"name": "camel.component.aws2-eks.configuration",
 			"description": "Component configuration",
@@ -177,11 +156,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-eks.basicPropertyBinding": {
-			"name": "camel.component.aws2-eks.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-eks.autowiredEnabled": {
+			"name": "camel.component.aws2-eks.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-eks.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json
index 83bdbcf..0b297d0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-eventbridge-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.eventbridgeClient": {
 			"name": "camel.sink.endpoint.eventbridgeClient",
 			"description": "To use a existing configured AWS Eventbridge as client",
@@ -87,13 +80,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -113,13 +99,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-eventbridge.autoDiscoverClient": {
-			"name": "camel.component.aws2-eventbridge.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-eventbridge.configuration": {
 			"name": "camel.component.aws2-eventbridge.configuration",
 			"description": "Component configuration",
@@ -191,11 +170,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-eventbridge.basicPropertyBinding": {
-			"name": "camel.component.aws2-eventbridge.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-eventbridge.autowiredEnabled": {
+			"name": "camel.component.aws2-eventbridge.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-eventbridge.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json
index 08c2c99..8f22852 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-iam-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.iamClient": {
 			"name": "camel.sink.endpoint.iamClient",
 			"description": "To use a existing configured AWS IAM as client",
@@ -81,13 +74,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -107,13 +93,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-iam.autoDiscoverClient": {
-			"name": "camel.component.aws2-iam.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-iam.configuration": {
 			"name": "camel.component.aws2-iam.configuration",
 			"description": "Component configuration",
@@ -179,11 +158,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-iam.basicPropertyBinding": {
-			"name": "camel.component.aws2-iam.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-iam.autowiredEnabled": {
+			"name": "camel.component.aws2-iam.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-iam.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-firehose-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-firehose-sink.json
index 924f505..bd6fed6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-firehose-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-firehose-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.cborEnabled": {
 			"name": "camel.sink.endpoint.cborEnabled",
 			"description": "This option will set the CBOR_ENABLED property during the execution",
@@ -80,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -112,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kinesis-firehose.autoDiscoverClient": {
-			"name": "camel.component.aws2-kinesis-firehose.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-kinesis-firehose.cborEnabled": {
 			"name": "camel.component.aws2-kinesis-firehose.cborEnabled",
 			"description": "This option will set the CBOR_ENABLED property during the execution",
@@ -177,11 +156,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kinesis-firehose.basicPropertyBinding": {
-			"name": "camel.component.aws2-kinesis-firehose.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-kinesis-firehose.autowiredEnabled": {
+			"name": "camel.component.aws2-kinesis-firehose.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-kinesis-firehose.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-sink.json
index 7164bbf..a93dca4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.cborEnabled": {
 			"name": "camel.sink.endpoint.cborEnabled",
 			"description": "This option will set the CBOR_ENABLED property during the execution",
@@ -74,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kinesis.autoDiscoverClient": {
-			"name": "camel.component.aws2-kinesis.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-kinesis.cborEnabled": {
 			"name": "camel.component.aws2-kinesis.cborEnabled",
 			"description": "This option will set the CBOR_ENABLED property during the execution",
@@ -165,11 +144,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kinesis.basicPropertyBinding": {
-			"name": "camel.component.aws2-kinesis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-kinesis.autowiredEnabled": {
+			"name": "camel.component.aws2-kinesis.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-kinesis.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-source.json
index ac64e66..85e31b7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kinesis-source.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.autoDiscoverClient": {
-			"name": "camel.source.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.cborEnabled": {
 			"name": "camel.source.endpoint.cborEnabled",
 			"description": "This option will set the CBOR_ENABLED property during the execution",
@@ -132,13 +125,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -257,13 +243,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kinesis.autoDiscoverClient": {
-			"name": "camel.component.aws2-kinesis.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-kinesis.cborEnabled": {
 			"name": "camel.component.aws2-kinesis.cborEnabled",
 			"description": "This option will set the CBOR_ENABLED property during the execution",
@@ -349,11 +328,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kinesis.basicPropertyBinding": {
-			"name": "camel.component.aws2-kinesis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-kinesis.autowiredEnabled": {
+			"name": "camel.component.aws2-kinesis.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-kinesis.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json
index 93b73f2..6ef3632 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-kms-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.kmsClient": {
 			"name": "camel.sink.endpoint.kmsClient",
 			"description": "To use a existing configured AWS KMS as client",
@@ -80,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kms.autoDiscoverClient": {
-			"name": "camel.component.aws2-kms.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-kms.configuration": {
 			"name": "camel.component.aws2-kms.configuration",
 			"description": "Component configuration",
@@ -177,11 +156,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-kms.basicPropertyBinding": {
-			"name": "camel.component.aws2-kms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-kms.autowiredEnabled": {
+			"name": "camel.component.aws2-kms.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-kms.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json
index fde785a..c633ac1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-lambda-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -62,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -107,13 +93,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-lambda.autoDiscoverClient": {
-			"name": "camel.component.aws2-lambda.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-lambda.configuration": {
 			"name": "camel.component.aws2-lambda.configuration",
 			"description": "Component configuration",
@@ -154,19 +133,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-lambda.autowiredEnabled": {
+			"name": "camel.component.aws2-lambda.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-lambda.awsLambdaClient": {
 			"name": "camel.component.aws2-lambda.awsLambdaClient",
 			"description": "To use a existing configured AwsLambdaClient as client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-lambda.basicPropertyBinding": {
-			"name": "camel.component.aws2-lambda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
-			"required": "false"
-		},
 		"camel.component.aws2-lambda.proxyHost": {
 			"name": "camel.component.aws2-lambda.proxyHost",
 			"description": "To define a proxy host when instantiating the Lambda client",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json
index 7939c06..7e5d312 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-mq-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -80,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -112,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-mq.autoDiscoverClient": {
-			"name": "camel.component.aws2-mq.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-mq.configuration": {
 			"name": "camel.component.aws2-mq.configuration",
 			"description": "Component configuration",
@@ -177,11 +156,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-mq.basicPropertyBinding": {
-			"name": "camel.component.aws2-mq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-mq.autowiredEnabled": {
+			"name": "camel.component.aws2-mq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-mq.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json
index 660a9d8..80ae5f8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-msk-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -80,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-msk.autoDiscoverClient": {
-			"name": "camel.component.aws2-msk.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-msk.configuration": {
 			"name": "camel.component.aws2-msk.configuration",
 			"description": "Component configuration",
@@ -177,11 +156,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-msk.basicPropertyBinding": {
-			"name": "camel.component.aws2-msk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-msk.autowiredEnabled": {
+			"name": "camel.component.aws2-msk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-msk.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json
index 498bb23..f3ac579 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json
@@ -21,6 +21,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.amazonS3Presigner": {
+			"name": "camel.sink.endpoint.amazonS3Presigner",
+			"description": "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.autoCreateBucket": {
 			"name": "camel.sink.endpoint.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
@@ -86,9 +92,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.useIAMCredentials": {
-			"name": "camel.sink.endpoint.useIAMCredentials",
-			"description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
+		"camel.sink.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -202,6 +208,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-s3.amazonS3Presigner": {
+			"name": "camel.component.aws2-s3.amazonS3Presigner",
+			"description": "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-s3.autoCreateBucket": {
 			"name": "camel.component.aws2-s3.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
@@ -273,9 +285,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.useIAMCredentials": {
-			"name": "camel.component.aws2-s3.useIAMCredentials",
-			"description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
+		"camel.component.aws2-s3.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-s3.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
index b79d280..6233e34 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
@@ -21,6 +21,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.amazonS3Presigner": {
+			"name": "camel.source.endpoint.amazonS3Presigner",
+			"description": "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.autoCreateBucket": {
 			"name": "camel.source.endpoint.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
@@ -86,9 +92,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.useIAMCredentials": {
-			"name": "camel.source.endpoint.useIAMCredentials",
-			"description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
+		"camel.source.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.source.endpoint.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -346,6 +352,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws2-s3.amazonS3Presigner": {
+			"name": "camel.component.aws2-s3.amazonS3Presigner",
+			"description": "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws2-s3.autoCreateBucket": {
 			"name": "camel.component.aws2-s3.autoCreateBucket",
 			"description": "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
@@ -417,9 +429,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.useIAMCredentials": {
-			"name": "camel.component.aws2-s3.useIAMCredentials",
-			"description": "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
+		"camel.component.aws2-s3.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-s3.useDefaultCredentialsProvider",
+			"description": "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json
index 64a5f5d..3454538 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-ses-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -91,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -123,13 +109,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ses.autoDiscoverClient": {
-			"name": "camel.component.aws2-ses.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ses.configuration": {
 			"name": "camel.component.aws2-ses.configuration",
 			"description": "component configuration",
@@ -199,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ses.basicPropertyBinding": {
-			"name": "camel.component.aws2-ses.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ses.autowiredEnabled": {
+			"name": "camel.component.aws2-ses.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-ses.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json
index d9a0728..49fb584 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sns-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to map headers to\/from Camel.",
@@ -124,9 +117,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+		"camel.sink.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
 			"required": "false"
@@ -163,13 +156,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sns.autoDiscoverClient": {
-			"name": "camel.component.aws2-sns.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-sns.configuration": {
 			"name": "camel.component.aws2-sns.configuration",
 			"description": "Component configuration",
@@ -259,11 +245,18 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sns.basicPropertyBinding": {
-			"name": "camel.component.aws2-sns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+		"camel.component.aws2-sns.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-sns.useDefaultCredentialsProvider",
+			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
-			"priority": "LOW",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.component.aws2-sns.autowiredEnabled": {
+			"name": "camel.component.aws2-sns.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-sns.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
index 35164dc..f731da7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-sink.json
@@ -35,13 +35,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to map headers to\/from Camel.",
@@ -81,8 +74,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.useIAMCredentials": {
-			"name": "camel.sink.endpoint.useIAMCredentials",
+		"camel.sink.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.sink.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
@@ -120,13 +113,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.delayQueue": {
 			"name": "camel.sink.endpoint.delayQueue",
 			"description": "Define if you want to apply delaySeconds option to the queue or on single messages",
@@ -221,13 +207,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.autoDiscoverClient": {
-			"name": "camel.component.aws2-sqs.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-sqs.configuration": {
 			"name": "camel.component.aws2-sqs.configuration",
 			"description": "The AWS SQS default configuration",
@@ -267,8 +246,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.useIAMCredentials": {
-			"name": "camel.component.aws2-sqs.useIAMCredentials",
+		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
@@ -306,11 +285,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.basicPropertyBinding": {
-			"name": "camel.component.aws2-sqs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-sqs.autowiredEnabled": {
+			"name": "camel.component.aws2-sqs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-sqs.delayQueue": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
index 7684b15..03e382c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sqs-source.json
@@ -35,13 +35,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.autoDiscoverClient": {
-			"name": "camel.source.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to map headers to\/from Camel.",
@@ -81,8 +74,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.useIAMCredentials": {
-			"name": "camel.source.endpoint.useIAMCredentials",
+		"camel.source.endpoint.useDefaultCredentialsProvider": {
+			"name": "camel.source.endpoint.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
@@ -203,13 +196,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.delayQueue": {
 			"name": "camel.source.endpoint.delayQueue",
 			"description": "Define if you want to apply delaySeconds option to the queue or on single messages",
@@ -397,13 +383,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.autoDiscoverClient": {
-			"name": "camel.component.aws2-sqs.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-sqs.configuration": {
 			"name": "camel.component.aws2-sqs.configuration",
 			"description": "The AWS SQS default configuration",
@@ -443,8 +422,8 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.useIAMCredentials": {
-			"name": "camel.component.aws2-sqs.useIAMCredentials",
+		"camel.component.aws2-sqs.useDefaultCredentialsProvider": {
+			"name": "camel.component.aws2-sqs.useDefaultCredentialsProvider",
 			"description": "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
 			"defaultValue": "false",
 			"priority": "MEDIUM",
@@ -534,11 +513,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sqs.basicPropertyBinding": {
-			"name": "camel.component.aws2-sqs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-sqs.autowiredEnabled": {
+			"name": "camel.component.aws2-sqs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-sqs.delayQueue": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sts-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sts-sink.json
index 204823e..f78d957 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sts-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-sts-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -82,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -108,13 +94,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sts.autoDiscoverClient": {
-			"name": "camel.component.aws2-sts.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-sts.configuration": {
 			"name": "camel.component.aws2-sts.configuration",
 			"description": "Component configuration",
@@ -181,11 +160,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-sts.basicPropertyBinding": {
-			"name": "camel.component.aws2-sts.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-sts.autowiredEnabled": {
+			"name": "camel.component.aws2-sts.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-sts.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
index dbd3df7..728a69d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-translate-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -100,13 +93,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -133,13 +119,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.autoDiscoverClient": {
-			"name": "camel.component.aws2-translate.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-translate.configuration": {
 			"name": "camel.component.aws2-translate.configuration",
 			"description": "Component configuration",
@@ -217,11 +196,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-translate.basicPropertyBinding": {
-			"name": "camel.component.aws2-translate.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-translate.autowiredEnabled": {
+			"name": "camel.component.aws2-translate.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-translate.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-sink.json
index ba81f00..bc13b85 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-sink.json
@@ -126,13 +126,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -263,11 +256,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-blob.basicPropertyBinding": {
-			"name": "camel.component.azure-blob.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-blob.autowiredEnabled": {
+			"name": "camel.component.azure-blob.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-blob.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-source.json
index 6664ec0..727fae7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-blob-source.json
@@ -99,13 +99,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -197,11 +190,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-blob.basicPropertyBinding": {
-			"name": "camel.component.azure-blob.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-blob.autowiredEnabled": {
+			"name": "camel.component.azure-blob.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-blob.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-sink.json
index cd82523..5772dc5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -149,11 +142,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-eventhubs.basicPropertyBinding": {
-			"name": "camel.component.azure-eventhubs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-eventhubs.autowiredEnabled": {
+			"name": "camel.component.azure-eventhubs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-eventhubs.connectionString": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-source.json
index 5f7d164..7a7f271 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-eventhubs-source.json
@@ -111,13 +111,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -227,11 +220,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-eventhubs.basicPropertyBinding": {
-			"name": "camel.component.azure-eventhubs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-eventhubs.autowiredEnabled": {
+			"name": "camel.component.azure-eventhubs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-eventhubs.connectionString": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-sink.json
index 3f4df98..44c36ae 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -143,11 +136,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-queue.basicPropertyBinding": {
-			"name": "camel.component.azure-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-queue.autowiredEnabled": {
+			"name": "camel.component.azure-queue.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-queue.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-source.json
index e372fa5..b83a303 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-queue-source.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -105,11 +98,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-queue.basicPropertyBinding": {
-			"name": "camel.component.azure-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-queue.autowiredEnabled": {
+			"name": "camel.component.azure-queue.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-queue.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json
index fcf267d..f9bc8ab 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-sink.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -369,11 +362,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-storage-blob.basicPropertyBinding": {
-			"name": "camel.component.azure-storage-blob.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-storage-blob.autowiredEnabled": {
+			"name": "camel.component.azure-storage-blob.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-storage-blob.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json
index 26374df..c9f8601 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-blob-source.json
@@ -135,13 +135,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -257,11 +250,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-storage-blob.basicPropertyBinding": {
-			"name": "camel.component.azure-storage-blob.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-storage-blob.autowiredEnabled": {
+			"name": "camel.component.azure-storage-blob.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-storage-blob.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-sink.json
index db772b0..3149f2c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-sink.json
@@ -54,13 +54,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -156,11 +149,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-storage-queue.basicPropertyBinding": {
-			"name": "camel.component.azure-storage-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-storage-queue.autowiredEnabled": {
+			"name": "camel.component.azure-storage-queue.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-storage-queue.maxMessages": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-source.json
index 840b43a..06350d7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-queue-source.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -142,11 +135,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.azure-storage-queue.basicPropertyBinding": {
-			"name": "camel.component.azure-storage-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.azure-storage-queue.autowiredEnabled": {
+			"name": "camel.component.azure-storage-queue.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.azure-storage-queue.maxMessages": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-bean-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-bean-sink.json
index e11e2c2..22125e0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-bean-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-bean-sink.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.parameters": {
 			"name": "camel.sink.endpoint.parameters",
 			"description": "Used for configuring additional properties on the bean",
@@ -82,11 +75,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.bean.basicPropertyBinding": {
-			"name": "camel.component.bean.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.bean.autowiredEnabled": {
+			"name": "camel.component.bean.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-sink.json
index b6f1984..f51f7cc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-sink.json
@@ -49,13 +49,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -70,11 +63,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.beanstalk.basicPropertyBinding": {
-			"name": "camel.component.beanstalk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.beanstalk.autowiredEnabled": {
+			"name": "camel.component.beanstalk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.beanstalk.connectionSettingsFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-source.json
index f0d7740..fa4b6c7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-beanstalk-source.json
@@ -94,13 +94,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -208,11 +201,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.beanstalk.basicPropertyBinding": {
-			"name": "camel.component.beanstalk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.beanstalk.autowiredEnabled": {
+			"name": "camel.component.beanstalk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.beanstalk.connectionSettingsFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-sink.json
index dadfe60..a2e8af0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-sink.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.httpParams": {
 			"name": "camel.sink.endpoint.httpParams",
 			"description": "Custom HTTP params for settings like proxy host",
@@ -172,11 +165,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.box.basicPropertyBinding": {
-			"name": "camel.component.box.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.box.autowiredEnabled": {
+			"name": "camel.component.box.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.box.httpParams": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-source.json
index 934fa84..9e546ef 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-box-source.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.httpParams": {
 			"name": "camel.source.endpoint.httpParams",
 			"description": "Custom HTTP params for settings like proxy host",
@@ -177,11 +170,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.box.basicPropertyBinding": {
-			"name": "camel.component.box.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.box.autowiredEnabled": {
+			"name": "camel.component.box.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.box.httpParams": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-braintree-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-braintree-sink.json
index 914d1a4..60a4b66 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-braintree-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-braintree-sink.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.httpReadTimeout": {
 			"name": "camel.sink.endpoint.httpReadTimeout",
 			"description": "Set read timeout for http calls.",
@@ -123,11 +116,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.braintree.basicPropertyBinding": {
-			"name": "camel.component.braintree.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.braintree.autowiredEnabled": {
+			"name": "camel.component.braintree.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.braintree.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-cache-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-cache-sink.json
index 06ccc33..d750804 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-cache-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-cache-sink.json
@@ -101,13 +101,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.keyType": {
 			"name": "camel.sink.endpoint.keyType",
 			"description": "The cache key type, default java.lang.Object",
@@ -213,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.caffeine-cache.basicPropertyBinding": {
-			"name": "camel.component.caffeine-cache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.caffeine-cache.autowiredEnabled": {
+			"name": "camel.component.caffeine-cache.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.caffeine-cache.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-loadcache-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-loadcache-sink.json
index 67ac789..3d90fa2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-loadcache-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-caffeine-loadcache-sink.json
@@ -101,13 +101,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.keyType": {
 			"name": "camel.sink.endpoint.keyType",
 			"description": "The cache key type, default java.lang.Object",
@@ -213,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.caffeine-loadcache.basicPropertyBinding": {
-			"name": "camel.component.caffeine-loadcache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.caffeine-loadcache.autowiredEnabled": {
+			"name": "camel.component.caffeine-loadcache.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.caffeine-loadcache.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chatscript-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chatscript-sink.json
index 00bb345..1cd514a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chatscript-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chatscript-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -69,11 +62,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.chatscript.basicPropertyBinding": {
-			"name": "camel.component.chatscript.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.chatscript.autowiredEnabled": {
+			"name": "camel.component.chatscript.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chunk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chunk-sink.json
index 6da2ef1..092ec55 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chunk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-chunk-sink.json
@@ -73,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -108,11 +101,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.chunk.basicPropertyBinding": {
-			"name": "camel.component.chunk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.chunk.autowiredEnabled": {
+			"name": "camel.component.chunk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cm-sms-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cm-sms-sink.json
index fe28c66..a6278d4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cm-sms-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cm-sms-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -69,11 +62,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cm-sms.basicPropertyBinding": {
-			"name": "camel.component.cm-sms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cm-sms.autowiredEnabled": {
+			"name": "camel.component.cm-sms.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-sink.json
index 5fda53b..50af492 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.sessionFacadeFactory": {
 			"name": "camel.sink.endpoint.sessionFacadeFactory",
 			"description": "To use a custom CMISSessionFacadeFactory to create the CMISSessionFacade instances",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cmis.basicPropertyBinding": {
-			"name": "camel.component.cmis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cmis.autowiredEnabled": {
+			"name": "camel.component.cmis.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cmis.sessionFacadeFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-source.json
index 2488598..c034baa 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cmis-source.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.sessionFacadeFactory": {
 			"name": "camel.source.endpoint.sessionFacadeFactory",
 			"description": "To use a custom CMISSessionFacadeFactory to create the CMISSessionFacade instances",
@@ -105,11 +98,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cmis.basicPropertyBinding": {
-			"name": "camel.component.cmis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cmis.autowiredEnabled": {
+			"name": "camel.component.cmis.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cmis.sessionFacadeFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-sink.json
index a6c41f5..720940c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coap-tcp.basicPropertyBinding": {
-			"name": "camel.component.coap-tcp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coap-tcp.autowiredEnabled": {
+			"name": "camel.component.coap-tcp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-source.json
index 1cb6177..4d9c186 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap+tcp-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -116,11 +109,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coap-tcp.basicPropertyBinding": {
-			"name": "camel.component.coap-tcp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coap-tcp.autowiredEnabled": {
+			"name": "camel.component.coap-tcp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-sink.json
index bc385e4..3a65fba 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coap.basicPropertyBinding": {
-			"name": "camel.component.coap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coap.autowiredEnabled": {
+			"name": "camel.component.coap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-source.json
index 8825030..c392b41 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coap-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -116,11 +109,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coap.basicPropertyBinding": {
-			"name": "camel.component.coap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coap.autowiredEnabled": {
+			"name": "camel.component.coap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-sink.json
index 7be5996..d692c63 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coaps-tcp.basicPropertyBinding": {
-			"name": "camel.component.coaps-tcp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coaps-tcp.autowiredEnabled": {
+			"name": "camel.component.coaps-tcp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-source.json
index edcf19d..d3330f8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps+tcp-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -116,11 +109,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coaps-tcp.basicPropertyBinding": {
-			"name": "camel.component.coaps-tcp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coaps-tcp.autowiredEnabled": {
+			"name": "camel.component.coaps-tcp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-sink.json
index 35414b1..4f9d555 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coaps.basicPropertyBinding": {
-			"name": "camel.component.coaps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coaps.autowiredEnabled": {
+			"name": "camel.component.coaps.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-source.json
index ac23d88..b380b17 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-coaps-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -116,11 +109,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.coaps.basicPropertyBinding": {
-			"name": "camel.component.coaps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.coaps.autowiredEnabled": {
+			"name": "camel.component.coaps.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-sink.json
index d25ad0e..bdac5d2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-sink.json
@@ -108,13 +108,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cometd.basicPropertyBinding": {
-			"name": "camel.component.cometd.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cometd.autowiredEnabled": {
+			"name": "camel.component.cometd.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cometd.extensions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-source.json
index d6674ca..7f2b555 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometd-source.json
@@ -120,13 +120,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -141,11 +134,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cometd.basicPropertyBinding": {
-			"name": "camel.component.cometd.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cometd.autowiredEnabled": {
+			"name": "camel.component.cometd.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cometd.extensions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-sink.json
index 5060f9f..7508551 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-sink.json
@@ -108,13 +108,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cometds.basicPropertyBinding": {
-			"name": "camel.component.cometds.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cometds.autowiredEnabled": {
+			"name": "camel.component.cometds.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cometds.extensions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-source.json
index 379a192..4bf6c37 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cometds-source.json
@@ -120,13 +120,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -141,11 +134,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cometds.basicPropertyBinding": {
-			"name": "camel.component.cometds.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cometds.autowiredEnabled": {
+			"name": "camel.component.cometds.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cometds.extensions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-sink.json
index 8900538..14e0769 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-sink.json
@@ -102,13 +102,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.consistencyMode": {
 			"name": "camel.sink.endpoint.consistencyMode",
 			"description": "The consistencyMode used for queries, default ConsistencyMode.DEFAULT One of: [DEFAULT] [STALE] [CONSISTENT]",
@@ -252,11 +245,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.consul.basicPropertyBinding": {
-			"name": "camel.component.consul.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.consul.autowiredEnabled": {
+			"name": "camel.component.consul.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.consul.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-source.json
index 083f50e..25516cb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-consul-source.json
@@ -101,13 +101,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.consistencyMode": {
 			"name": "camel.source.endpoint.consistencyMode",
 			"description": "The consistencyMode used for queries, default ConsistencyMode.DEFAULT One of: [DEFAULT] [STALE] [CONSISTENT]",
@@ -259,11 +252,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.consul.basicPropertyBinding": {
-			"name": "camel.component.consul.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.consul.autowiredEnabled": {
+			"name": "camel.component.consul.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.consul.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-controlbus-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-controlbus-sink.json
index 791893f..b85e5b0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-controlbus-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-controlbus-sink.json
@@ -61,13 +61,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -82,11 +75,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.controlbus.basicPropertyBinding": {
-			"name": "camel.component.controlbus.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.controlbus.autowiredEnabled": {
+			"name": "camel.component.controlbus.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-sink.json
index 0b3ce91..170e27f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.corda.basicPropertyBinding": {
-			"name": "camel.component.corda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.corda.autowiredEnabled": {
+			"name": "camel.component.corda.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.corda.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-source.json
index e79d1fa..2f69199 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-corda-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.corda.basicPropertyBinding": {
-			"name": "camel.component.corda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.corda.autowiredEnabled": {
+			"name": "camel.component.corda.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.corda.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
index 0d2f926..9f09af5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-sink.json
@@ -113,10 +113,10 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
+		"camel.sink.endpoint.connectTimeout": {
+			"name": "camel.sink.endpoint.connectTimeout",
+			"description": "Define the timeoutconnect in milliseconds",
+			"defaultValue": "2500L",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -153,11 +153,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.couchbase.basicPropertyBinding": {
-			"name": "camel.component.couchbase.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.couchbase.autowiredEnabled": {
+			"name": "camel.component.couchbase.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json
index 59fba50..c5397eb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchbase-source.json
@@ -80,6 +80,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.fullDocument": {
+			"name": "camel.source.endpoint.fullDocument",
+			"description": "If true consumer will return complete document instead data defined in view",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.limit": {
 			"name": "camel.source.endpoint.limit",
 			"description": "The output limit to use",
@@ -144,10 +151,10 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
+		"camel.source.endpoint.connectTimeout": {
+			"name": "camel.source.endpoint.connectTimeout",
+			"description": "Define the timeoutconnect in milliseconds",
+			"defaultValue": "2500L",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -277,11 +284,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.couchbase.basicPropertyBinding": {
-			"name": "camel.component.couchbase.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.couchbase.autowiredEnabled": {
+			"name": "camel.component.couchbase.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-sink.json
index 5f8ba53..594adbe 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -81,11 +74,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.couchdb.basicPropertyBinding": {
-			"name": "camel.component.couchdb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.couchdb.autowiredEnabled": {
+			"name": "camel.component.couchdb.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-source.json
index a02dc67..a49469e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-couchdb-source.json
@@ -94,13 +94,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -127,11 +120,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.couchdb.basicPropertyBinding": {
-			"name": "camel.component.couchdb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.couchdb.autowiredEnabled": {
+			"name": "camel.component.couchdb.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-sink.json
index ea12b51..11f68f9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-sink.json
@@ -102,13 +102,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -123,11 +116,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cql.basicPropertyBinding": {
-			"name": "camel.component.cql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cql.autowiredEnabled": {
+			"name": "camel.component.cql.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-source.json
index 12d7374..f647a3a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cql-source.json
@@ -127,13 +127,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -241,11 +234,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cql.basicPropertyBinding": {
-			"name": "camel.component.cql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cql.autowiredEnabled": {
+			"name": "camel.component.cql.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cron-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cron-source.json
index 61f2106..f3a9969 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cron-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cron-source.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cron.basicPropertyBinding": {
-			"name": "camel.component.cron.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cron.autowiredEnabled": {
+			"name": "camel.component.cron.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cron.cronService": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-cms-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-cms-sink.json
index c93d64f..f205f2a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-cms-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-cms-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -138,11 +131,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.crypto-cms.basicPropertyBinding": {
-			"name": "camel.component.crypto-cms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.crypto-cms.autowiredEnabled": {
+			"name": "camel.component.crypto-cms.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.crypto-cms.envelopedDataDecryptorConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-sink.json
index 4b11cb8..3c6175e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-crypto-sink.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "Set the size of the buffer used to read in the Exchange payload data.",
@@ -227,11 +220,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.crypto.basicPropertyBinding": {
-			"name": "camel.component.crypto.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.crypto.autowiredEnabled": {
+			"name": "camel.component.crypto.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.crypto.bufferSize": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-sink.json
index 4d7d778..8141af6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bus": {
 			"name": "camel.sink.endpoint.bus",
 			"description": "To use a custom configured CXF Bus.",
@@ -245,11 +238,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cxf.basicPropertyBinding": {
-			"name": "camel.component.cxf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cxf.autowiredEnabled": {
+			"name": "camel.component.cxf.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cxf.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-source.json
index 0b95a40..a535eed 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxf-source.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bus": {
 			"name": "camel.source.endpoint.bus",
 			"description": "To use a custom configured CXF Bus.",
@@ -220,11 +213,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cxf.basicPropertyBinding": {
-			"name": "camel.component.cxf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cxf.autowiredEnabled": {
+			"name": "camel.component.cxf.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cxf.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-sink.json
index 038051f..e9e4920 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-sink.json
@@ -124,13 +124,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom CxfBinding to control the binding between Camel Message and CXF Message.",
@@ -197,11 +190,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cxfrs.basicPropertyBinding": {
-			"name": "camel.component.cxfrs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cxfrs.autowiredEnabled": {
+			"name": "camel.component.cxfrs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cxfrs.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-source.json
index 3088d0d..6f35492 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-cxfrs-source.json
@@ -109,13 +109,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "To use a custom CxfBinding to control the binding between Camel Message and CXF Message.",
@@ -182,11 +175,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.cxfrs.basicPropertyBinding": {
-			"name": "camel.component.cxfrs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.cxfrs.autowiredEnabled": {
+			"name": "camel.component.cxfrs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.cxfrs.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dataformat-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dataformat-sink.json
index 7d5660a..f06b740 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dataformat-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dataformat-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -49,11 +42,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.dataformat.basicPropertyBinding": {
-			"name": "camel.component.dataformat.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.dataformat.autowiredEnabled": {
+			"name": "camel.component.dataformat.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-sink.json
index 4b2910a..7feaab7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-sink.json
@@ -43,13 +43,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -78,11 +71,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.direct.basicPropertyBinding": {
-			"name": "camel.component.direct.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.direct.autowiredEnabled": {
+			"name": "camel.component.direct.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-source.json
index 81bcd27..c801cf2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-source.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -55,11 +48,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.direct.basicPropertyBinding": {
-			"name": "camel.component.direct.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.direct.autowiredEnabled": {
+			"name": "camel.component.direct.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-sink.json
index 2e46031..7b1600b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-sink.json
@@ -49,13 +49,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.propagateProperties": {
 			"name": "camel.sink.endpoint.propagateProperties",
 			"description": "Whether to propagate or not properties from the producer side to the consumer side, and vice versa. Default value: true.",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.direct-vm.basicPropertyBinding": {
-			"name": "camel.component.direct-vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.direct-vm.autowiredEnabled": {
+			"name": "camel.component.direct-vm.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.direct-vm.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-source.json
index 5cd3aed..f3b3b3d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-direct-vm-source.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.propagateProperties": {
 			"name": "camel.source.endpoint.propagateProperties",
 			"description": "Whether to propagate or not properties from the producer side to the consumer side, and vice versa. Default value: true.",
@@ -62,11 +55,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.direct-vm.basicPropertyBinding": {
-			"name": "camel.component.direct-vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.direct-vm.autowiredEnabled": {
+			"name": "camel.component.direct-vm.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.direct-vm.headerFilterStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-sink.json
index 9e6bfe0..f46a021 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-sink.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -99,11 +92,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.disruptor.basicPropertyBinding": {
-			"name": "camel.component.disruptor.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.disruptor.autowiredEnabled": {
+			"name": "camel.component.disruptor.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-source.json
index ff7db81..4d77fc6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-source.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -111,11 +104,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.disruptor.basicPropertyBinding": {
-			"name": "camel.component.disruptor.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.disruptor.autowiredEnabled": {
+			"name": "camel.component.disruptor.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-sink.json
index ef58b8b..f42b31e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-sink.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -99,11 +92,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.disruptor-vm.basicPropertyBinding": {
-			"name": "camel.component.disruptor-vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.disruptor-vm.autowiredEnabled": {
+			"name": "camel.component.disruptor-vm.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-source.json
index 30da73a..0521f25 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-disruptor-vm-source.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -111,11 +104,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.disruptor-vm.basicPropertyBinding": {
-			"name": "camel.component.disruptor-vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.disruptor-vm.autowiredEnabled": {
+			"name": "camel.component.disruptor-vm.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-djl-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-djl-sink.json
index ea49fb1..3baf0c9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-djl-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-djl-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.djl.basicPropertyBinding": {
-			"name": "camel.component.djl.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.djl.autowiredEnabled": {
+			"name": "camel.component.djl.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dns-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dns-sink.json
index 8177b41..1cbf3f2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dns-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dns-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.dns.basicPropertyBinding": {
-			"name": "camel.component.dns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.dns.autowiredEnabled": {
+			"name": "camel.component.dns.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-sink.json
index 9d03c90..b26174c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.cmdExecFactory": {
 			"name": "camel.sink.endpoint.cmdExecFactory",
 			"description": "The fully qualified class name of the DockerCmdExecFactory implementation to use",
@@ -188,11 +181,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.docker.basicPropertyBinding": {
-			"name": "camel.component.docker.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.docker.autowiredEnabled": {
+			"name": "camel.component.docker.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.docker.cmdExecFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-source.json
index d0b97bf..b5149f7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-docker-source.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.cmdExecFactory": {
 			"name": "camel.source.endpoint.cmdExecFactory",
 			"description": "The fully qualified class name of the DockerCmdExecFactory implementation to use",
@@ -200,11 +193,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.docker.basicPropertyBinding": {
-			"name": "camel.component.docker.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.docker.autowiredEnabled": {
+			"name": "camel.component.docker.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.docker.cmdExecFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dozer-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dozer-sink.json
index 1216fe6..257c7a4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dozer-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dozer-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -80,11 +73,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.dozer.basicPropertyBinding": {
-			"name": "camel.component.dozer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.dozer.autowiredEnabled": {
+			"name": "camel.component.dozer.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-drill-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-drill-sink.json
index 4700406..29e3f24 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-drill-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-drill-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -69,11 +62,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.drill.basicPropertyBinding": {
-			"name": "camel.component.drill.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.drill.autowiredEnabled": {
+			"name": "camel.component.drill.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-sink.json
index 90aeaf9..29e58aa 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-sink.json
@@ -70,13 +70,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.dropbox.basicPropertyBinding": {
-			"name": "camel.component.dropbox.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.dropbox.autowiredEnabled": {
+			"name": "camel.component.dropbox.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-source.json
index 0048253..c0f7e60 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-dropbox-source.json
@@ -82,13 +82,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -103,11 +96,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.dropbox.basicPropertyBinding": {
-			"name": "camel.component.dropbox.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.dropbox.autowiredEnabled": {
+			"name": "camel.component.dropbox.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-sink.json
index 69e6506..1b3ce3e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-sink.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.configuration": {
 			"name": "camel.sink.endpoint.configuration",
 			"description": "The default cache configuration to be used to create caches.",
@@ -141,11 +134,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ehcache.basicPropertyBinding": {
-			"name": "camel.component.ehcache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ehcache.autowiredEnabled": {
+			"name": "camel.component.ehcache.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ehcache.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-source.json
index 50afb6e..e7ae72f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ehcache-source.json
@@ -79,13 +79,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.configuration": {
 			"name": "camel.source.endpoint.configuration",
 			"description": "The default cache configuration to be used to create caches.",
@@ -169,11 +162,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ehcache.basicPropertyBinding": {
-			"name": "camel.component.ehcache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ehcache.autowiredEnabled": {
+			"name": "camel.component.ehcache.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ehcache.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elasticsearch-rest-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elasticsearch-rest-sink.json
index ea97ab4..c8e5d5a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elasticsearch-rest-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elasticsearch-rest-sink.json
@@ -129,13 +129,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -150,11 +143,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.elasticsearch-rest.basicPropertyBinding": {
-			"name": "camel.component.elasticsearch-rest.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.elasticsearch-rest.autowiredEnabled": {
+			"name": "camel.component.elasticsearch-rest.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.elasticsearch-rest.client": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-sink.json
index 24cab34..6fbdc6d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-sink.json
@@ -107,13 +107,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.elSqlConfig": {
 			"name": "camel.sink.endpoint.elSqlConfig",
 			"description": "To use a specific configured ElSqlConfig. It may be better to use the databaseVendor option instead.",
@@ -184,11 +177,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.elsql.basicPropertyBinding": {
-			"name": "camel.component.elsql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.elsql.autowiredEnabled": {
+			"name": "camel.component.elsql.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.elsql.elSqlConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-source.json
index 4fd6a20..beee596 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-elsql-source.json
@@ -176,13 +176,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.elSqlConfig": {
 			"name": "camel.source.endpoint.elSqlConfig",
 			"description": "To use a specific configured ElSqlConfig. It may be better to use the databaseVendor option instead.",
@@ -346,11 +339,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.elsql.basicPropertyBinding": {
-			"name": "camel.component.elsql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.elsql.autowiredEnabled": {
+			"name": "camel.component.elsql.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.elsql.elSqlConfig": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-keys-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-keys-sink.json
index a9072b9..4d22ec1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-keys-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-keys-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -133,11 +126,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.etcd-keys.basicPropertyBinding": {
-			"name": "camel.component.etcd-keys.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.etcd-keys.autowiredEnabled": {
+			"name": "camel.component.etcd-keys.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.etcd-keys.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-sink.json
index 29f18a7..bd34283 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -133,11 +126,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.etcd-stats.basicPropertyBinding": {
-			"name": "camel.component.etcd-stats.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.etcd-stats.autowiredEnabled": {
+			"name": "camel.component.etcd-stats.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.etcd-stats.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-source.json
index 75e296b..ea705f7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-stats-source.json
@@ -88,13 +88,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -267,11 +260,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.etcd-stats.basicPropertyBinding": {
-			"name": "camel.component.etcd-stats.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.etcd-stats.autowiredEnabled": {
+			"name": "camel.component.etcd-stats.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.etcd-stats.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-watch-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-watch-source.json
index a29f515..4325030 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-watch-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-etcd-watch-source.json
@@ -75,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.etcd-watch.basicPropertyBinding": {
-			"name": "camel.component.etcd-watch.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.etcd-watch.autowiredEnabled": {
+			"name": "camel.component.etcd-watch.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.etcd-watch.password": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-exec-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-exec-sink.json
index 8c59022..48d20d8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-exec-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-exec-sink.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -93,11 +86,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.exec.basicPropertyBinding": {
-			"name": "camel.component.exec.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.exec.autowiredEnabled": {
+			"name": "camel.component.exec.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-sink.json
index 85ac1f1..70b840f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-sink.json
@@ -565,13 +565,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -765,11 +758,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.facebook.basicPropertyBinding": {
-			"name": "camel.component.facebook.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.facebook.autowiredEnabled": {
+			"name": "camel.component.facebook.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.facebook.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-source.json
index 72ad9d2..265ddf7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-facebook-source.json
@@ -577,13 +577,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -777,11 +770,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.facebook.basicPropertyBinding": {
-			"name": "camel.component.facebook.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.facebook.autowiredEnabled": {
+			"name": "camel.component.facebook.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.facebook.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-sink.json
index 84c89d6..57d8997 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-sink.json
@@ -67,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.client": {
 			"name": "camel.sink.endpoint.client",
 			"description": "To use the custom client",
@@ -235,11 +228,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.fhir.basicPropertyBinding": {
-			"name": "camel.component.fhir.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.fhir.autowiredEnabled": {
+			"name": "camel.component.fhir.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.fhir.client": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-source.json
index fb9960b..70b6288 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fhir-source.json
@@ -92,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.client": {
 			"name": "camel.source.endpoint.client",
 			"description": "To use the custom client",
@@ -353,11 +346,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.fhir.basicPropertyBinding": {
-			"name": "camel.component.fhir.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.fhir.autowiredEnabled": {
+			"name": "camel.component.fhir.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.fhir.client": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json
index ccd2b8b..d0ad9e6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-sink.json
@@ -138,13 +138,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).",
@@ -180,11 +173,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.file.basicPropertyBinding": {
-			"name": "camel.component.file.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.file.autowiredEnabled": {
+			"name": "camel.component.file.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-source.json
index d6886c9..241da1e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-source.json
@@ -170,13 +170,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bufferSize": {
 			"name": "camel.source.endpoint.bufferSize",
 			"description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).",
@@ -525,11 +518,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.file.basicPropertyBinding": {
-			"name": "camel.component.file.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.file.autowiredEnabled": {
+			"name": "camel.component.file.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-watch-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-watch-source.json
index 8c3e415..8630d71 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-watch-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-file-watch-source.json
@@ -97,13 +97,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -153,11 +146,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.file-watch.basicPropertyBinding": {
-			"name": "camel.component.file-watch.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.file-watch.autowiredEnabled": {
+			"name": "camel.component.file-watch.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-sink.json
index fb16a39..c66f383 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-sink.json
@@ -70,13 +70,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.flatpack.basicPropertyBinding": {
-			"name": "camel.component.flatpack.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.flatpack.autowiredEnabled": {
+			"name": "camel.component.flatpack.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-source.json
index 4eadf9e..d7da7d6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flatpack-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -209,11 +202,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.flatpack.basicPropertyBinding": {
-			"name": "camel.component.flatpack.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.flatpack.autowiredEnabled": {
+			"name": "camel.component.flatpack.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flink-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flink-sink.json
index b91abe0..b2b5245 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flink-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-flink-sink.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.flink.basicPropertyBinding": {
-			"name": "camel.component.flink.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.flink.autowiredEnabled": {
+			"name": "camel.component.flink.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fop-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fop-sink.json
index 5396bdb..9fbcf35 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fop-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-fop-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -55,11 +48,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.fop.basicPropertyBinding": {
-			"name": "camel.component.fop.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.fop.autowiredEnabled": {
+			"name": "camel.component.fop.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-freemarker-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-freemarker-sink.json
index 753a958..7bf78fa 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-freemarker-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-freemarker-sink.json
@@ -61,13 +61,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -96,11 +89,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.freemarker.basicPropertyBinding": {
-			"name": "camel.component.freemarker.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.freemarker.autowiredEnabled": {
+			"name": "camel.component.freemarker.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.freemarker.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-sink.json
index 4db7308..0a6138f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-sink.json
@@ -207,13 +207,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).",
@@ -330,11 +323,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ftp.basicPropertyBinding": {
-			"name": "camel.component.ftp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ftp.autowiredEnabled": {
+			"name": "camel.component.ftp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-source.json
index 23de80d..ca488d90 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftp-source.json
@@ -252,13 +252,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bufferSize": {
 			"name": "camel.source.endpoint.bufferSize",
 			"description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).",
@@ -663,11 +656,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ftp.basicPropertyBinding": {
-			"name": "camel.component.ftp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ftp.autowiredEnabled": {
+			"name": "camel.component.ftp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	},
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json
index ee1d57e..7aeefb9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json
@@ -207,13 +207,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).",
@@ -381,11 +374,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ftps.basicPropertyBinding": {
-			"name": "camel.component.ftps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ftps.autowiredEnabled": {
+			"name": "camel.component.ftps.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ftps.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json
index 3734e61..58fa685 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json
@@ -252,13 +252,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bufferSize": {
 			"name": "camel.source.endpoint.bufferSize",
 			"description": "Buffer size in bytes used for writing files (or in case of FTP for downloading and uploading files).",
@@ -714,11 +707,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ftps.basicPropertyBinding": {
-			"name": "camel.component.ftps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ftps.autowiredEnabled": {
+			"name": "camel.component.ftps.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ftps.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ganglia-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ganglia-sink.json
index d16b98e..db4ad6d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ganglia-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ganglia-sink.json
@@ -111,13 +111,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -213,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ganglia.basicPropertyBinding": {
-			"name": "camel.component.ganglia.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ganglia.autowiredEnabled": {
+			"name": "camel.component.ganglia.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ganglia.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-geocoder-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-geocoder-sink.json
index 922c10d..677b4d3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-geocoder-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-geocoder-sink.json
@@ -54,13 +54,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -135,11 +128,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.geocoder.basicPropertyBinding": {
-			"name": "camel.component.geocoder.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.geocoder.autowiredEnabled": {
+			"name": "camel.component.geocoder.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.geocoder.geoApiContext": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json
index bea3a4b..e0242bf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-sink.json
@@ -71,13 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.git.basicPropertyBinding": {
-			"name": "camel.component.git.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.git.autowiredEnabled": {
+			"name": "camel.component.git.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json
index a7f7dcd..8827032 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-git-source.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -67,11 +60,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.git.basicPropertyBinding": {
-			"name": "camel.component.git.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.git.autowiredEnabled": {
+			"name": "camel.component.git.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-sink.json
index 481931f..fa11773 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-sink.json
@@ -11,7 +11,7 @@
 	"properties": {
 		"camel.sink.path.type": {
 			"name": "camel.sink.path.type",
-			"description": "What git operation to execute One of: [CLOSEPULLREQUEST] [PULLREQUESTCOMMENT] [COMMIT] [PULLREQUEST] [TAG] [PULLREQUESTSTATE] [PULLREQUESTFILES] [GETCOMMITFILE] [CREATEISSUE]",
+			"description": "What git operation to execute One of: [CLOSEPULLREQUEST] [PULLREQUESTCOMMENT] [COMMIT] [PULLREQUEST] [TAG] [PULLREQUESTSTATE] [PULLREQUESTFILES] [GETCOMMITFILE] [CREATEISSUE] [EVENT]",
 			"priority": "HIGH",
 			"required": "true"
 		},
@@ -70,13 +70,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.github.basicPropertyBinding": {
-			"name": "camel.component.github.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.github.autowiredEnabled": {
+			"name": "camel.component.github.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-source.json
index e6e8679..74c2dcf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-github-source.json
@@ -11,7 +11,7 @@
 	"properties": {
 		"camel.source.path.type": {
 			"name": "camel.source.path.type",
-			"description": "What git operation to execute One of: [CLOSEPULLREQUEST] [PULLREQUESTCOMMENT] [COMMIT] [PULLREQUEST] [TAG] [PULLREQUESTSTATE] [PULLREQUESTFILES] [GETCOMMITFILE] [CREATEISSUE]",
+			"description": "What git operation to execute One of: [CLOSEPULLREQUEST] [PULLREQUESTCOMMENT] [COMMIT] [PULLREQUEST] [TAG] [PULLREQUESTSTATE] [PULLREQUESTFILES] [GETCOMMITFILE] [CREATEISSUE] [EVENT]",
 			"priority": "HIGH",
 			"required": "true"
 		},
@@ -58,6 +58,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.sendEmptyMessageWhenIdle": {
+			"name": "camel.source.endpoint.sendEmptyMessageWhenIdle",
+			"description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.eventFetchStrategy": {
+			"name": "camel.source.endpoint.eventFetchStrategy",
+			"description": "To specify a custom strategy that configures how the EventsConsumer fetches events.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.source.endpoint.exceptionHandler": {
 			"name": "camel.source.endpoint.exceptionHandler",
 			"description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -70,10 +83,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
+		"camel.source.endpoint.pollStrategy": {
+			"name": "camel.source.endpoint.pollStrategy",
+			"description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -84,6 +96,99 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.source.endpoint.backoffErrorThreshold": {
+			"name": "camel.source.endpoint.backoffErrorThreshold",
+			"description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.backoffIdleThreshold": {
+			"name": "camel.source.endpoint.backoffIdleThreshold",
+			"description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.backoffMultiplier": {
+			"name": "camel.source.endpoint.backoffMultiplier",
+			"description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and\/or backoffErrorThreshold must also be configured.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.delay": {
+			"name": "camel.source.endpoint.delay",
+			"description": "Milliseconds before the next poll.",
+			"defaultValue": "500L",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.greedy": {
+			"name": "camel.source.endpoint.greedy",
+			"description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.",
+			"defaultValue": "false",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.initialDelay": {
+			"name": "camel.source.endpoint.initialDelay",
+			"description": "Milliseconds before the first poll starts.",
+			"defaultValue": "1000L",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.repeatCount": {
+			"name": "camel.source.endpoint.repeatCount",
+			"description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever.",
+			"defaultValue": "0L",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.runLoggingLevel": {
+			"name": "camel.source.endpoint.runLoggingLevel",
+			"description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the logging level for that. One of: [TRACE] [DEBUG] [INFO] [WARN] [ERROR] [OFF]",
+			"defaultValue": "\"TRACE\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.scheduledExecutorService": {
+			"name": "camel.source.endpoint.scheduledExecutorService",
+			"description": "Allows for configuring a custom\/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.scheduler": {
+			"name": "camel.source.endpoint.scheduler",
+			"description": "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler",
+			"defaultValue": "\"none\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.schedulerProperties": {
+			"name": "camel.source.endpoint.schedulerProperties",
+			"description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.startScheduler": {
+			"name": "camel.source.endpoint.startScheduler",
+			"description": "Whether the scheduler should be auto started.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.timeUnit": {
+			"name": "camel.source.endpoint.timeUnit",
+			"description": "Time unit for initialDelay and delay options. One of: [NANOSECONDS] [MICROSECONDS] [MILLISECONDS] [SECONDS] [MINUTES] [HOURS] [DAYS]",
+			"defaultValue": "\"MILLISECONDS\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
+		"camel.source.endpoint.useFixedDelay": {
+			"name": "camel.source.endpoint.useFixedDelay",
+			"description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.github.bridgeErrorHandler": {
 			"name": "camel.component.github.bridgeErrorHandler",
 			"description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
@@ -91,11 +196,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.github.basicPropertyBinding": {
-			"name": "camel.component.github.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.github.autowiredEnabled": {
+			"name": "camel.component.github.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sink.json
index c65c0c1..50fd4e3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sink.json
@@ -29,7 +29,7 @@
 		},
 		"camel.sink.endpoint.connectionFactory": {
 			"name": "camel.sink.endpoint.connectionFactory",
-			"description": "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used",
+			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -62,7 +55,7 @@
 		},
 		"camel.component.google-bigquery.connectionFactory": {
 			"name": "camel.component.google-bigquery.connectionFactory",
-			"description": "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used",
+			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -85,11 +78,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-bigquery.basicPropertyBinding": {
-			"name": "camel.component.google-bigquery.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-bigquery.autowiredEnabled": {
+			"name": "camel.component.google-bigquery.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
index 3ab7c7a..bc125cd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-bigquery-sql-sink.json
@@ -23,7 +23,7 @@
 		},
 		"camel.sink.endpoint.connectionFactory": {
 			"name": "camel.sink.endpoint.connectionFactory",
-			"description": "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used",
+			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -50,7 +43,7 @@
 		},
 		"camel.component.google-bigquery-sql.connectionFactory": {
 			"name": "camel.component.google-bigquery-sql.connectionFactory",
-			"description": "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used",
+			"description": "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -67,11 +60,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-bigquery-sql.basicPropertyBinding": {
-			"name": "camel.component.google-bigquery-sql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-bigquery-sql.autowiredEnabled": {
+			"name": "camel.component.google-bigquery-sql.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-sink.json
index f3fb195..da2c84f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-sink.json
@@ -71,13 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -153,11 +146,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-calendar.basicPropertyBinding": {
-			"name": "camel.component.google-calendar.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-calendar.autowiredEnabled": {
+			"name": "camel.component.google-calendar.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-calendar.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-source.json
index e8430e5..1d22d4e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-source.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -271,11 +264,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-calendar.basicPropertyBinding": {
-			"name": "camel.component.google-calendar.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-calendar.autowiredEnabled": {
+			"name": "camel.component.google-calendar.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-calendar.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-stream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-stream-source.json
index 35faf42..3eb0b44 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-stream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-calendar-stream-source.json
@@ -99,13 +99,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -289,11 +282,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-calendar-stream.basicPropertyBinding": {
-			"name": "camel.component.google-calendar-stream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-calendar-stream.autowiredEnabled": {
+			"name": "camel.component.google-calendar-stream.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-calendar-stream.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-sink.json
index 2cd3aa7..cfbbb63 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-sink.json
@@ -58,13 +58,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -121,11 +114,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-drive.basicPropertyBinding": {
-			"name": "camel.component.google-drive.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-drive.autowiredEnabled": {
+			"name": "camel.component.google-drive.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-drive.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-source.json
index e8a3c56..c594957 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-drive-source.json
@@ -83,13 +83,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -239,11 +232,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-drive.basicPropertyBinding": {
-			"name": "camel.component.google-drive.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-drive.autowiredEnabled": {
+			"name": "camel.component.google-drive.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-drive.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-sink.json
index 282c1de..a30fc68 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-sink.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -103,11 +96,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-mail.basicPropertyBinding": {
-			"name": "camel.component.google-mail.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-mail.autowiredEnabled": {
+			"name": "camel.component.google-mail.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-mail.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-source.json
index d769b34..3d17168 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-source.json
@@ -71,13 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -221,11 +214,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-mail.basicPropertyBinding": {
-			"name": "camel.component.google-mail.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-mail.autowiredEnabled": {
+			"name": "camel.component.google-mail.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-mail.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-stream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-stream-source.json
index b094a69..c6d5387 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-stream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-mail-stream-source.json
@@ -86,13 +86,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -257,11 +250,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-mail-stream.basicPropertyBinding": {
-			"name": "camel.component.google-mail-stream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-mail-stream.autowiredEnabled": {
+			"name": "camel.component.google-mail-stream.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-mail-stream.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json
index 5a4d35a..a5fdc30 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-sink.json
@@ -62,10 +62,9 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
+		"camel.sink.endpoint.serializer": {
+			"name": "camel.sink.endpoint.serializer",
+			"description": "A custom GooglePubsubSerializer to use for serializing message payloads in the producer",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
@@ -101,11 +100,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-pubsub.basicPropertyBinding": {
-			"name": "camel.component.google-pubsub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-pubsub.autowiredEnabled": {
+			"name": "camel.component.google-pubsub.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-pubsub.publisherTerminationTimeout": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json
index 59726a8..56baf37 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-pubsub-source.json
@@ -74,13 +74,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -101,11 +94,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-pubsub.basicPropertyBinding": {
-			"name": "camel.component.google-pubsub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-pubsub.autowiredEnabled": {
+			"name": "camel.component.google-pubsub.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-pubsub.publisherTerminationTimeout": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-sink.json
index 15251ab..c2679b2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-sink.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -103,11 +96,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-sheets.basicPropertyBinding": {
-			"name": "camel.component.google-sheets.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-sheets.autowiredEnabled": {
+			"name": "camel.component.google-sheets.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-sheets.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-source.json
index b5df53f..f1205d8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -235,11 +228,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-sheets.basicPropertyBinding": {
-			"name": "camel.component.google-sheets.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-sheets.autowiredEnabled": {
+			"name": "camel.component.google-sheets.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-sheets.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-stream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-stream-source.json
index 9d03966..6d5acdf 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-stream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-google-sheets-stream-source.json
@@ -111,13 +111,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -313,11 +306,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.google-sheets-stream.basicPropertyBinding": {
-			"name": "camel.component.google-sheets-stream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.google-sheets-stream.autowiredEnabled": {
+			"name": "camel.component.google-sheets-stream.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.google-sheets-stream.clientFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-sink.json
index dddd783..eae6149 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.hadoopConfiguration": {
 			"name": "camel.sink.endpoint.hadoopConfiguration",
 			"description": "Hadoop Configuration",
@@ -74,11 +67,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.gora.basicPropertyBinding": {
-			"name": "camel.component.gora.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.gora.autowiredEnabled": {
+			"name": "camel.component.gora.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-source.json
index 5142baf..e141292 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-gora-source.json
@@ -125,13 +125,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.hadoopConfiguration": {
 			"name": "camel.source.endpoint.hadoopConfiguration",
 			"description": "Hadoop Configuration",
@@ -152,11 +145,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.gora.basicPropertyBinding": {
-			"name": "camel.component.gora.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.gora.autowiredEnabled": {
+			"name": "camel.component.gora.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grape-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grape-sink.json
index 0170d8f..08c8e22 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grape-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grape-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.grape.basicPropertyBinding": {
-			"name": "camel.component.grape.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.grape.autowiredEnabled": {
+			"name": "camel.component.grape.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.grape.patchesRepository": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-graphql-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-graphql-sink.json
index 87fa1a9..e44f0f1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-graphql-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-graphql-sink.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -72,6 +65,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.sink.endpoint.jwtAuthorizationType": {
+			"name": "camel.sink.endpoint.jwtAuthorizationType",
+			"description": "The JWT Authorization type. Default is Bearer.",
+			"defaultValue": "\"Bearer\"",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.sink.endpoint.password": {
 			"name": "camel.sink.endpoint.password",
 			"description": "The password for Basic authentication.",
@@ -91,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.graphql.basicPropertyBinding": {
-			"name": "camel.component.graphql.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.graphql.autowiredEnabled": {
+			"name": "camel.component.graphql.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json
index fac545a..f8c3cb4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-sink.json
@@ -80,13 +80,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -170,11 +163,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.grpc.basicPropertyBinding": {
-			"name": "camel.component.grpc.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.grpc.autowiredEnabled": {
+			"name": "camel.component.grpc.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json
index 7233809..802385e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-grpc-source.json
@@ -102,13 +102,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -192,11 +185,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.grpc.basicPropertyBinding": {
-			"name": "camel.component.grpc.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.grpc.autowiredEnabled": {
+			"name": "camel.component.grpc.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-sink.json
index 55d4734..6d4d482 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.guava-eventbus.basicPropertyBinding": {
-			"name": "camel.component.guava-eventbus.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.guava-eventbus.autowiredEnabled": {
+			"name": "camel.component.guava-eventbus.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-source.json
index a59ada0..ce7f82c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-guava-eventbus-source.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -79,11 +72,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.guava-eventbus.basicPropertyBinding": {
-			"name": "camel.component.guava-eventbus.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.guava-eventbus.autowiredEnabled": {
+			"name": "camel.component.guava-eventbus.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-atomicvalue-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-atomicvalue-sink.json
index e9865bf..0bd60cb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-atomicvalue-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-atomicvalue-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-atomicvalue.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-atomicvalue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-atomicvalue.autowiredEnabled": {
+			"name": "camel.component.hazelcast-atomicvalue.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-atomicvalue.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-instance-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-instance-source.json
index d50d21f..600d88b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-instance-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-instance-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-instance.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-instance.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-instance.autowiredEnabled": {
+			"name": "camel.component.hazelcast-instance.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-instance.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-sink.json
index ae12cbd..948c18f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-list.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-list.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-list.autowiredEnabled": {
+			"name": "camel.component.hazelcast-list.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-list.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-source.json
index 1d4d217..faf207d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-list-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-list.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-list.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-list.autowiredEnabled": {
+			"name": "camel.component.hazelcast-list.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-list.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-sink.json
index 2ae965e..94bed19 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-map.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-map.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-map.autowiredEnabled": {
+			"name": "camel.component.hazelcast-map.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-map.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-source.json
index 3081304..8b41497 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-map-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-map.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-map.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-map.autowiredEnabled": {
+			"name": "camel.component.hazelcast-map.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-map.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-sink.json
index 487cde4..1fd6b63 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-multimap.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-multimap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-multimap.autowiredEnabled": {
+			"name": "camel.component.hazelcast-multimap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-multimap.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-source.json
index 84aa80f..c59682e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-multimap-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-multimap.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-multimap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-multimap.autowiredEnabled": {
+			"name": "camel.component.hazelcast-multimap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-multimap.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-sink.json
index 58ff367..6978375 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-queue.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-queue.autowiredEnabled": {
+			"name": "camel.component.hazelcast-queue.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-queue.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-source.json
index ba51ed8..5fc319b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-queue-source.json
@@ -73,13 +73,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-queue.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-queue.autowiredEnabled": {
+			"name": "camel.component.hazelcast-queue.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-queue.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-sink.json
index a416e13..a0cdaf4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-replicatedmap.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-replicatedmap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-replicatedmap.autowiredEnabled": {
+			"name": "camel.component.hazelcast-replicatedmap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-replicatedmap.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-source.json
index 39e097f..eaf7d48 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-replicatedmap-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-replicatedmap.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-replicatedmap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-replicatedmap.autowiredEnabled": {
+			"name": "camel.component.hazelcast-replicatedmap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-replicatedmap.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-ringbuffer-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-ringbuffer-sink.json
index 1027c9c..d361990 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-ringbuffer-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-ringbuffer-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-ringbuffer.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-ringbuffer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-ringbuffer.autowiredEnabled": {
+			"name": "camel.component.hazelcast-ringbuffer.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-ringbuffer.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-sink.json
index c8bad4f..91711b8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -96,11 +89,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-seda.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-seda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-seda.autowiredEnabled": {
+			"name": "camel.component.hazelcast-seda.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-seda.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-source.json
index 84cd305..aec6092 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-seda-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -108,11 +101,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-seda.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-seda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-seda.autowiredEnabled": {
+			"name": "camel.component.hazelcast-seda.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-seda.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-sink.json
index 4c78e3b..a88fb39 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-sink.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-set.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-set.autowiredEnabled": {
+			"name": "camel.component.hazelcast-set.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-set.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-source.json
index bcbb11e..9430425 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-set-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-set.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-set.autowiredEnabled": {
+			"name": "camel.component.hazelcast-set.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-set.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-sink.json
index e108ff4..73ec949 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -68,11 +61,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-topic.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-topic.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-topic.autowiredEnabled": {
+			"name": "camel.component.hazelcast-topic.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-topic.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-source.json
index b814031..b360de1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hazelcast-topic-source.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -80,11 +73,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hazelcast-topic.basicPropertyBinding": {
-			"name": "camel.component.hazelcast-topic.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hazelcast-topic.autowiredEnabled": {
+			"name": "camel.component.hazelcast-topic.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hazelcast-topic.hazelcastInstance": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-sink.json
index bd70314..e68610a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-sink.json
@@ -71,13 +71,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -99,11 +92,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hbase.basicPropertyBinding": {
-			"name": "camel.component.hbase.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hbase.autowiredEnabled": {
+			"name": "camel.component.hbase.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hbase.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-source.json
index c8b0b52..ac63208 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hbase-source.json
@@ -101,13 +101,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hbase.basicPropertyBinding": {
-			"name": "camel.component.hbase.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hbase.autowiredEnabled": {
+			"name": "camel.component.hbase.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hbase.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-sink.json
index 7faafd1..65d3bb2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.blockSize": {
 			"name": "camel.sink.endpoint.blockSize",
 			"description": "The size of the HDFS blocks",
@@ -204,11 +197,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hdfs.basicPropertyBinding": {
-			"name": "camel.component.hdfs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hdfs.autowiredEnabled": {
+			"name": "camel.component.hdfs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hdfs.jAASConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-source.json
index e309032..68e3a85 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-hdfs-source.json
@@ -121,13 +121,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.blockSize": {
 			"name": "camel.source.endpoint.blockSize",
 			"description": "The size of the HDFS blocks",
@@ -329,11 +322,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.hdfs.basicPropertyBinding": {
-			"name": "camel.component.hdfs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.hdfs.autowiredEnabled": {
+			"name": "camel.component.hdfs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.hdfs.jAASConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json
index c2e1cbc..dd450ae 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-http-sink.json
@@ -149,13 +149,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientBuilder": {
 			"name": "camel.sink.endpoint.clientBuilder",
 			"description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.",
@@ -376,11 +369,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.http.basicPropertyBinding": {
-			"name": "camel.component.http.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.http.autowiredEnabled": {
+			"name": "camel.component.http.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.http.clientConnectionManager": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
index d39661a..5b251c7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-https-sink.json
@@ -149,13 +149,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientBuilder": {
 			"name": "camel.sink.endpoint.clientBuilder",
 			"description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint.",
@@ -376,11 +369,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.https.basicPropertyBinding": {
-			"name": "camel.component.https.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.https.autowiredEnabled": {
+			"name": "camel.component.https.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.https.clientConnectionManager": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-sink.json
index 11b6db2..164f695 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -154,11 +147,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.iec60870-client.basicPropertyBinding": {
-			"name": "camel.component.iec60870-client.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.iec60870-client.autowiredEnabled": {
+			"name": "camel.component.iec60870-client.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-source.json
index 81dd9d1..6e3ab9c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-client-source.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -166,11 +159,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.iec60870-client.basicPropertyBinding": {
-			"name": "camel.component.iec60870-client.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.iec60870-client.autowiredEnabled": {
+			"name": "camel.component.iec60870-client.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-sink.json
index 62c81b2..2b0a836 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-sink.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.iec60870-server.basicPropertyBinding": {
-			"name": "camel.component.iec60870-server.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.iec60870-server.autowiredEnabled": {
+			"name": "camel.component.iec60870-server.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-source.json
index 0897485..c099a05 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-iec60870-server-source.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -173,11 +166,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.iec60870-server.basicPropertyBinding": {
-			"name": "camel.component.iec60870-server.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.iec60870-server.autowiredEnabled": {
+			"name": "camel.component.iec60870-server.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-sink.json
index 1aa0400..85738f7 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-sink.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -101,11 +94,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-cache.basicPropertyBinding": {
-			"name": "camel.component.ignite-cache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-cache.autowiredEnabled": {
+			"name": "camel.component.ignite-cache.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-source.json
index 9f18510..daab3ca 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-cache-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -134,11 +127,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-cache.basicPropertyBinding": {
-			"name": "camel.component.ignite-cache.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-cache.autowiredEnabled": {
+			"name": "camel.component.ignite-cache.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-compute-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-compute-sink.json
index bbecf6a..e22c925 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-compute-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-compute-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -105,11 +98,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-compute.basicPropertyBinding": {
-			"name": "camel.component.ignite-compute.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-compute.autowiredEnabled": {
+			"name": "camel.component.ignite-compute.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-events-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-events-source.json
index 647cda7..d05d14a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-events-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-events-source.json
@@ -61,13 +61,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -100,11 +93,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-events.basicPropertyBinding": {
-			"name": "camel.component.ignite-events.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-events.autowiredEnabled": {
+			"name": "camel.component.ignite-events.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-idgen-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-idgen-sink.json
index 64556ed..3de037f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-idgen-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-idgen-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-idgen.basicPropertyBinding": {
-			"name": "camel.component.ignite-idgen.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-idgen.autowiredEnabled": {
+			"name": "camel.component.ignite-idgen.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-sink.json
index 518df40..cdb2844 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-messaging.basicPropertyBinding": {
-			"name": "camel.component.ignite-messaging.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-messaging.autowiredEnabled": {
+			"name": "camel.component.ignite-messaging.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-source.json
index 3e3ac11..99db795 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-messaging-source.json
@@ -54,13 +54,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -93,11 +86,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-messaging.basicPropertyBinding": {
-			"name": "camel.component.ignite-messaging.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-messaging.autowiredEnabled": {
+			"name": "camel.component.ignite-messaging.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-queue-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-queue-sink.json
index 07ac670..2009bf9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-queue-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-queue-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -99,11 +92,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-queue.basicPropertyBinding": {
-			"name": "camel.component.ignite-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-queue.autowiredEnabled": {
+			"name": "camel.component.ignite-queue.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-set-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-set-sink.json
index a5df7f6..127331f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-set-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ignite-set-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -87,11 +80,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ignite-set.basicPropertyBinding": {
-			"name": "camel.component.ignite-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ignite-set.autowiredEnabled": {
+			"name": "camel.component.ignite-set.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-sink.json
index 4eee86f..3312240 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -275,11 +268,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.imap.basicPropertyBinding": {
-			"name": "camel.component.imap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.imap.autowiredEnabled": {
+			"name": "camel.component.imap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.imap.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-source.json
index 191b48d..3e91ea3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imap-source.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -528,11 +521,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.imap.basicPropertyBinding": {
-			"name": "camel.component.imap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.imap.autowiredEnabled": {
+			"name": "camel.component.imap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.imap.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-sink.json
index e40ad78..3eb2fbd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-sink.json
@@ -96,13 +96,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -275,11 +268,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.imaps.basicPropertyBinding": {
-			"name": "camel.component.imaps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.imaps.autowiredEnabled": {
+			"name": "camel.component.imaps.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.imaps.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-source.json
index 03f860a..2bc6f2e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-imaps-source.json
@@ -185,13 +185,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "Sets the binding used to convert from a Camel message to and from a Mail message",
@@ -528,11 +521,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.imaps.basicPropertyBinding": {
-			"name": "camel.component.imaps.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.imaps.autowiredEnabled": {
+			"name": "camel.component.imaps.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.imaps.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-infinispan-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-infinispan-sink.json
index 7279674..6a05c73 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-infinispan-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-infinispan-sink.json
@@ -102,13 +102,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.cacheContainer": {
 			"name": "camel.sink.endpoint.cacheContainer",
 			"description": "Specifies the cache Container to connect",
@@ -251,11 +244,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.infinispan.basicPropertyBinding": {
-			"name": "camel.component.infinispan.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.infinispan.autowiredEnabled": {
... 1050 lines suppressed ...


[camel-kafka-connector] 15/18: Regen and fixed compilation

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

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

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

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

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


[camel-kafka-connector] 03/18: Added Memory Idempotency support for both sink and source

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

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

commit 5465d13ef8f012a389123e3523c471e6c40cacc7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 17 19:40:15 2020 +0100

    Added Memory Idempotency support for both sink and source
---
 .../camel/kafkaconnector/CamelConnectorConfig.java |  16 ++
 .../kafkaconnector/CamelSinkConnectorConfig.java   |   8 +-
 .../apache/camel/kafkaconnector/CamelSinkTask.java |   9 ++
 .../kafkaconnector/CamelSourceConnectorConfig.java |   8 +-
 .../camel/kafkaconnector/CamelSourceTask.java      |   9 +-
 .../utils/CamelKafkaConnectMain.java               |  69 ++++++++-
 .../camel/kafkaconnector/CamelSinkTaskTest.java    | 172 +++++++++++++++++++++
 .../camel/kafkaconnector/CamelSourceTaskTest.java  |  99 ++++++++++++
 8 files changed, 379 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java
index 4271938..0332576 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java
@@ -47,6 +47,22 @@ public abstract class CamelConnectorConfig extends AbstractConfig {
     public static final String CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_CONF = "camel.error.handler.redelivery.delay";
     public static final String CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_DOC = "The initial redelivery delay in milliseconds in case of Default Error Handler";
     
+    public static final Boolean CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DEFAULT = false;
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF = "camel.idempotency.enabled";
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DOC = "If in memory idempotency must be enabled or not";
+    
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_DEFAULT = "body";
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF = "camel.idempotency.expression.type";
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_DOC = "How the idempotency will be evaluated: possible values are body and header";
+    
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_DEFAULT = null;
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF = "camel.idempotency.expression.header";
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_DOC = "The header name that will be evaluated in case of camel.idempotency.expression.type equals to header";    
+    
+    public static final int CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DEFAULT = 100;
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF = "camel.idempotency.memory.dimension";
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DOC = "The Memory dimension of the in memory idempotent Repository";
+    
     protected CamelConnectorConfig(ConfigDef definition, Map<?, ?> originals, Map<String, ?> configProviderProps, boolean doLog) {
         super(definition, originals, configProviderProps, doLog);
     }
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
index e86e921..299d578 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
@@ -57,8 +57,12 @@ public class CamelSinkConnectorConfig extends CamelConnectorConfig {
         .define(CAMEL_CONNECTOR_AGGREGATE_TIMEOUT_CONF, Type.LONG, CAMEL_CONNECTOR_AGGREGATE_TIMEOUT_DEFAULT, Importance.MEDIUM, CAMEL_CONNECTOR_AGGREGATE_TIMEOUT_DOC)
         .define(CAMEL_CONNECTOR_ERROR_HANDLER_CONF, Type.STRING, CAMEL_CONNECTOR_ERROR_HANDLER_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_ERROR_HANDLER_DOC)
         .define(CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_CONF, Type.INT, CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_DEFAULT, Importance.MEDIUM, CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_DOC)
-        .define(CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_CONF, Type.LONG, CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_DEFAULT, Importance.MEDIUM, CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_DOC);
-
+        .define(CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_CONF, Type.LONG, CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_DEFAULT, Importance.MEDIUM, CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, Type.BOOLEAN, CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF, Type.INT, CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DOC);
+    
     public CamelSinkConnectorConfig(ConfigDef config, Map<String, String> parsedConfig) {
         super(config, parsedConfig);
     }
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
index a38afea..2cc01a2 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
@@ -85,6 +85,11 @@ public class CamelSinkTask extends SinkTask {
             final int maxRedeliveries = config.getInt(CamelSinkConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_CONF);
             final long redeliveryDelay = config.getLong(CamelSinkConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_CONF);
             final String errorHandler = config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_CONF);
+            final Boolean idempotencyEnabled = config.getBoolean(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF);
+            final String expressionType = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF);
+            final String expressionHeader = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF);
+            final int memoryDimension = config.getInt(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF);
+            
             CamelContext camelContext = new DefaultCamelContext();
             if (remoteUrl == null) {
                 remoteUrl = TaskHelper.buildUrl(camelContext,
@@ -103,6 +108,10 @@ public class CamelSinkTask extends SinkTask {
                 .withErrorHandler(errorHandler)
                 .withMaxRedeliveries(maxRedeliveries)
                 .withRedeliveryDelay(redeliveryDelay)
+                .withIdempotencyEnabled(idempotencyEnabled)
+                .withExpressionType(expressionType)
+                .withExpressionHeader(expressionHeader)
+                .withMemoryDimension(memoryDimension)
                 .build(camelContext);
 
 
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceConnectorConfig.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceConnectorConfig.java
index 2ecfb45..70e2b09 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceConnectorConfig.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceConnectorConfig.java
@@ -93,8 +93,12 @@ public class CamelSourceConnectorConfig extends CamelConnectorConfig {
         .define(CAMEL_CONNECTOR_AGGREGATE_TIMEOUT_CONF, Type.LONG, CAMEL_CONNECTOR_AGGREGATE_TIMEOUT_DEFAULT, Importance.MEDIUM, CAMEL_CONNECTOR_AGGREGATE_TIMEOUT_DOC)
         .define(CAMEL_CONNECTOR_ERROR_HANDLER_CONF, Type.STRING, CAMEL_CONNECTOR_ERROR_HANDLER_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_ERROR_HANDLER_DOC)
         .define(CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_CONF, Type.INT, CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_DEFAULT, Importance.MEDIUM, CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_DOC)
-        .define(CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_CONF, Type.LONG, CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_DEFAULT, Importance.MEDIUM, CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_DOC);
-
+        .define(CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_CONF, Type.LONG, CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_DEFAULT, Importance.MEDIUM, CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, Type.BOOLEAN, CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF, Type.INT, CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DOC);
+    
     public CamelSourceConnectorConfig(ConfigDef config, Map<String, String> parsedConfig) {
         super(config, parsedConfig);
     }
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
index 165ffff..e32d1c2 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
@@ -91,7 +91,10 @@ public class CamelSourceTask extends SourceTask {
             final int maxRedeliveries = config.getInt(CamelSinkConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_CONF);
             final long redeliveryDelay = config.getLong(CamelSinkConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_CONF);
             final String errorHandler = config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_CONF);
-            
+            final Boolean idempotencyEnabled = config.getBoolean(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF);
+            final String expressionType = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF);
+            final String expressionHeader = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF);
+            final int memoryDimension = config.getInt(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF);
             topics = config.getString(CamelSourceConnectorConfig.TOPIC_CONF).split(",");
 
             String localUrl = getLocalUrlWithPollingOptions(config);
@@ -113,6 +116,10 @@ public class CamelSourceTask extends SourceTask {
                 .withErrorHandler(errorHandler)
                 .withMaxRedeliveries(maxRedeliveries)
                 .withRedeliveryDelay(redeliveryDelay)
+                .withIdempotencyEnabled(idempotencyEnabled)
+                .withExpressionType(expressionType)
+                .withExpressionHeader(expressionHeader)
+                .withMemoryDimension(memoryDimension)
                 .build(camelContext);
 
             consumer = cms.getCamelContext().getEndpoint(localUrl).createPollingConsumer();
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index 7a43f0f..d0695bd 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -28,6 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.kafkaconnector.CamelConnectorConfig;
 import org.apache.camel.main.SimpleMain;
 import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
@@ -94,6 +95,10 @@ public class CamelKafkaConnectMain extends SimpleMain {
         private String errorHandler;
         private int maxRedeliveries;
         private long redeliveryDelay;
+        private boolean idempotencyEnabled;
+        private String expressionType;
+        private String expressionHeader;
+        private int memoryDimension;
 
         public Builder(String from, String to) {
             this.from = from;
@@ -139,6 +144,26 @@ public class CamelKafkaConnectMain extends SimpleMain {
             this.redeliveryDelay = redeliveryDelay;
             return this;
         }
+        
+        public Builder withIdempotencyEnabled(boolean idempotencyEnabled) {
+        	this.idempotencyEnabled = idempotencyEnabled;
+        	return this;
+        }
+        
+        public Builder withExpressionType(String expressionType) {
+        	this.expressionType = expressionType;
+        	return this;
+        }
+        
+        public Builder withExpressionHeader(String expressionHeader) {
+        	this.expressionHeader = expressionHeader;
+        	return this;
+        }
+        
+        public Builder withMemoryDimension(int memoryDimension) {
+        	this.memoryDimension = memoryDimension;
+        	return this;
+        }
 
         public CamelKafkaConnectMain build(CamelContext camelContext) {
             CamelKafkaConnectMain camelMain = new CamelKafkaConnectMain(camelContext);
@@ -183,13 +208,45 @@ public class CamelKafkaConnectMain extends SimpleMain {
                     if (getContext().getRegistry().lookupByName("aggregate") != null) {
                         //aggregation
                         AggregationStrategy s = getContext().getRegistry().lookupByNameAndType(CamelConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_NAME, AggregationStrategy.class);
-                        LOG.info(".aggregate({}).constant(true).completionSize({}).completionTimeout({})", s, aggregationSize, aggregationTimeout);
-                        LOG.info(".to({})", to);
-                        rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).toD(to);
+                        if (idempotencyEnabled) {
+                            switch (expressionType) {
+                                case "body":
+                                    LOG.info(".aggregate({}).constant(true).completionSize({}).completionTimeout({}).idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository({}))", s, aggregationSize, aggregationTimeout, memoryDimension);
+                                    LOG.info(".to({})", to);
+                                	rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
+                                    break;
+                                case "header":
+                                    LOG.info(".aggregate({}).constant(true).completionSize({}).completionTimeout({}).idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository({}))", s, aggregationSize, aggregationTimeout, memoryDimension);
+                                    LOG.info(".to({})", to);
+                                    rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
+                                    break;
+                                default:
+                                    break;
+                            }
+                        } else {
+                            LOG.info(".aggregate({}).constant(true).completionSize({}).completionTimeout({})", s, aggregationSize, aggregationTimeout);
+                            LOG.info(".to({})", to);
+                            rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).toD(to);
+                        }
                     } else {
-                        //to
-                        LOG.info(".to({})", to);
-                        rd.toD(to);
+                        if (idempotencyEnabled) {
+                            switch (expressionType) {
+                                case "body":
+                                	LOG.info("idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository({})).to({})", memoryDimension, to);
+                                	rd.idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
+                                    break;
+                                case "header":
+                                	LOG.info("idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository({})).to({})", memoryDimension, to);
+                                    rd.idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
+                                    break;
+                                default:
+                                    break;
+                            }
+                        } else {
+                            //to
+                            LOG.info(".to({})", to);
+                            rd.toD(to);
+                        }
                     }
                 }
             });
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
index 6559456..9472206 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
@@ -29,8 +29,10 @@ import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
 import org.apache.kafka.connect.data.Decimal;
 import org.apache.kafka.connect.data.Schema;
+import org.apache.kafka.connect.data.SchemaAndValue;
 import org.apache.kafka.connect.data.SchemaBuilder;
 import org.apache.kafka.connect.errors.ConnectException;
+import org.apache.kafka.connect.header.Header;
 import org.apache.kafka.connect.sink.SinkRecord;
 import org.junit.jupiter.api.Test;
 
@@ -663,6 +665,176 @@ public class CamelSinkTaskTest {
 
         sinkTask.stop();
     }
+    
+    @Test
+    public void testAggregationWithIdempotencyBodyAndTimeout() throws InterruptedException {
+        Map<String, String> props = new HashMap<>();
+        props.put(TOPIC_CONF, TOPIC_NAME);
+        props.put(CamelSinkConnectorConfig.CAMEL_SINK_URL_CONF, SEDA_URI);
+        props.put(CamelSinkConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_CONF, "#class:org.apache.camel.kafkaconnector.utils.SampleAggregator");
+        props.put(CamelSinkConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_SIZE_CONF, "5");
+        props.put(CamelSinkConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_TIMEOUT_CONF, "100");
+        props.put(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, "true");
+        props.put(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, "body");
+        CamelSinkTask sinkTask = new CamelSinkTask();
+        sinkTask.start(props);
+
+        List<SinkRecord> records = new ArrayList<SinkRecord>();
+        SinkRecord record = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record1 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel1", 42);
+        SinkRecord record2 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel2", 42);
+        SinkRecord record3 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel3", 42);
+        SinkRecord record4 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel4", 42);
+        SinkRecord record5 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record6 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel1", 42);
+        SinkRecord record7 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel2", 42);
+        SinkRecord record8 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel3", 42);
+        SinkRecord record9 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel4", 42);
+        SinkRecord record10 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel5", 42);
+        SinkRecord record11 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel6", 42);
+        SinkRecord record12 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel7", 42);
+        SinkRecord record13 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel8", 42);
+        SinkRecord record14 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel9", 42);
+        records.add(record);
+        records.add(record1);
+        records.add(record2);
+        records.add(record3);
+        records.add(record4);
+        records.add(record5);
+        records.add(record6);
+        records.add(record7);
+        records.add(record8);
+        records.add(record9);
+        records.add(record10);
+        records.add(record11);
+        records.add(record12);
+        records.add(record13);
+        records.add(record14);
+
+        sinkTask.put(records);
+
+        ConsumerTemplate consumer = sinkTask.getCms().getConsumerTemplate();
+        Exchange exchange = consumer.receive(SEDA_URI, RECEIVE_TIMEOUT);
+        assertEquals("camel camel1 camel2 camel3 camel4", exchange.getMessage().getBody());
+        assertEquals("test", exchange.getMessage().getHeaders().get(CamelSinkTask.KAFKA_RECORD_KEY_HEADER));
+        assertEquals(LoggingLevel.OFF.toString(), sinkTask.getCamelSinkConnectorConfig(props)
+            .getString(CamelSinkConnectorConfig.CAMEL_SINK_CONTENT_LOG_LEVEL_CONF));
+        
+        exchange = consumer.receive(SEDA_URI, RECEIVE_TIMEOUT);
+        assertEquals("camel5 camel6 camel7 camel8 camel9", exchange.getMessage().getBody());
+        assertEquals("test", exchange.getMessage().getHeaders().get(CamelSinkTask.KAFKA_RECORD_KEY_HEADER));
+        assertEquals(LoggingLevel.OFF.toString(), sinkTask.getCamelSinkConnectorConfig(props)
+            .getString(CamelSinkConnectorConfig.CAMEL_SINK_CONTENT_LOG_LEVEL_CONF));
+
+        sinkTask.stop();
+    }
+    
+    @Test
+    public void testWithIdempotency() throws InterruptedException {
+        Map<String, String> props = new HashMap<>();
+        props.put(TOPIC_CONF, TOPIC_NAME);
+        props.put(CamelSinkConnectorConfig.CAMEL_SINK_URL_CONF, SEDA_URI);
+        props.put(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, "true");
+        props.put(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, "body");
+        CamelSinkTask sinkTask = new CamelSinkTask();
+        sinkTask.start(props);
+
+        List<SinkRecord> records = new ArrayList<SinkRecord>();
+        SinkRecord record = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record1 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record2 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record3 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record4 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel1", 42);
+        SinkRecord record5 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record6 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record7 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record8 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record9 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel2", 42);
+        SinkRecord record10 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record11 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record12 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record13 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        SinkRecord record14 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        records.add(record);
+        records.add(record1);
+        records.add(record2);
+        records.add(record3);
+        records.add(record4);
+        records.add(record5);
+        records.add(record6);
+        records.add(record7);
+        records.add(record8);
+        records.add(record9);
+        records.add(record10);
+        records.add(record11);
+        records.add(record12);
+        records.add(record13);
+        records.add(record14);
+
+        sinkTask.put(records);
+
+        ConsumerTemplate consumer = sinkTask.getCms().getConsumerTemplate();
+        Exchange exchange = consumer.receive(SEDA_URI, RECEIVE_TIMEOUT);
+        assertEquals("camel", exchange.getMessage().getBody());
+        assertEquals("test", exchange.getMessage().getHeaders().get(CamelSinkTask.KAFKA_RECORD_KEY_HEADER));
+        assertEquals(LoggingLevel.OFF.toString(), sinkTask.getCamelSinkConnectorConfig(props)
+            .getString(CamelSinkConnectorConfig.CAMEL_SINK_CONTENT_LOG_LEVEL_CONF));
+        
+        exchange = consumer.receive(SEDA_URI, RECEIVE_TIMEOUT);
+        assertEquals("camel1", exchange.getMessage().getBody());
+        assertEquals("test", exchange.getMessage().getHeaders().get(CamelSinkTask.KAFKA_RECORD_KEY_HEADER));
+        assertEquals(LoggingLevel.OFF.toString(), sinkTask.getCamelSinkConnectorConfig(props)
+            .getString(CamelSinkConnectorConfig.CAMEL_SINK_CONTENT_LOG_LEVEL_CONF));
+        
+        exchange = consumer.receive(SEDA_URI, RECEIVE_TIMEOUT);
+        assertEquals("camel2", exchange.getMessage().getBody());
+        assertEquals("test", exchange.getMessage().getHeaders().get(CamelSinkTask.KAFKA_RECORD_KEY_HEADER));
+        assertEquals(LoggingLevel.OFF.toString(), sinkTask.getCamelSinkConnectorConfig(props)
+            .getString(CamelSinkConnectorConfig.CAMEL_SINK_CONTENT_LOG_LEVEL_CONF));
+
+        sinkTask.stop();
+    }
+    
+    @Test
+    public void testWithIdempotencyAndHeader() throws InterruptedException {
+        Map<String, String> props = new HashMap<>();
+        props.put(TOPIC_CONF, TOPIC_NAME);
+        props.put(CamelSinkConnectorConfig.CAMEL_SINK_URL_CONF, SEDA_URI);
+        props.put(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, "true");
+        props.put(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, "header");
+        props.put(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF, "headerIdempotency");
+        CamelSinkTask sinkTask = new CamelSinkTask();
+        sinkTask.start(props);
+
+        List<SinkRecord> records = new ArrayList<SinkRecord>();
+        SinkRecord record = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        record.headers().add("CamelHeader.headerIdempotency", new SchemaAndValue(Schema.STRING_SCHEMA, "Test"));
+        SinkRecord record1 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel", 42);
+        record1.headers().add("CamelHeader.headerIdempotency", new SchemaAndValue(Schema.STRING_SCHEMA, "Test"));
+        SinkRecord record2 = new SinkRecord(TOPIC_NAME, 1, null, "test", null, "camel1", 42);
+        record2.headers().add("CamelHeader.headerIdempotency", new SchemaAndValue(Schema.STRING_SCHEMA, "Test1"));
+
+        records.add(record);
+        records.add(record1);
+        records.add(record2);
+
+        sinkTask.put(records);
+
+        ConsumerTemplate consumer = sinkTask.getCms().getConsumerTemplate();
+        Exchange exchange = consumer.receive(SEDA_URI, RECEIVE_TIMEOUT);
+        assertEquals("camel", exchange.getMessage().getBody());
+        assertEquals("test", exchange.getMessage().getHeaders().get(CamelSinkTask.KAFKA_RECORD_KEY_HEADER));
+        assertEquals(LoggingLevel.OFF.toString(), sinkTask.getCamelSinkConnectorConfig(props)
+            .getString(CamelSinkConnectorConfig.CAMEL_SINK_CONTENT_LOG_LEVEL_CONF));
+        
+        exchange = consumer.receive(SEDA_URI, RECEIVE_TIMEOUT);
+        assertEquals("camel1", exchange.getMessage().getBody());
+        assertEquals("test", exchange.getMessage().getHeaders().get(CamelSinkTask.KAFKA_RECORD_KEY_HEADER));
+        assertEquals(LoggingLevel.OFF.toString(), sinkTask.getCamelSinkConnectorConfig(props)
+            .getString(CamelSinkConnectorConfig.CAMEL_SINK_CONTENT_LOG_LEVEL_CONF));
+
+        sinkTask.stop();
+    }
 
     @Test
     public void testSecretRaw() {
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
index ef393f9..ea7bb1b 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
@@ -436,4 +436,103 @@ public class CamelSourceTaskTest {
             sourceTask.stop();
         }
     }
+    
+    @Test
+    public void testSourcePollingWithIdempotencyEnabledAndBody() {
+
+        CamelSourceTask sourceTask = new CamelSourceTask();
+        sourceTask.start(mapOf(
+            CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME,
+            CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, DIRECT_URI,
+            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, true,
+            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, "body"
+        ));
+
+        try {
+
+        	sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, "Test");
+        	sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, "Test1");
+        	sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, "Test");
+        	sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, "Test2");
+
+            List<SourceRecord> records = sourceTask.poll();
+
+            assertThat(records).hasSize(3);
+            assertThat(records).element(0).hasFieldOrPropertyWithValue("value", "Test");
+            assertThat(records).element(1).hasFieldOrPropertyWithValue("value", "Test1");
+            assertThat(records).element(2).hasFieldOrPropertyWithValue("value", "Test2");
+        } finally {
+            sourceTask.stop();
+        }
+    }
+    
+    @Test
+    public void testSourcePollingWithIdempotencyEnabledAndHeader() {
+
+        CamelSourceTask sourceTask = new CamelSourceTask();
+        sourceTask.start(mapOf(
+            CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME,
+            CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, DIRECT_URI,
+            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, true,
+            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, "header",
+            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF, "headerIdempotency"
+        ));
+
+        try {
+
+        	sourceTask.getCms().getProducerTemplate().sendBodyAndHeader(DIRECT_URI, "Test", "headerIdempotency", "Test");
+        	sourceTask.getCms().getProducerTemplate().sendBodyAndHeader(DIRECT_URI, "Test1", "headerIdempotency", "Test1");
+        	sourceTask.getCms().getProducerTemplate().sendBodyAndHeader(DIRECT_URI, "TestTest", "headerIdempotency", "Test");
+        	sourceTask.getCms().getProducerTemplate().sendBodyAndHeader(DIRECT_URI, "Test2", "headerIdempotency", "Test2");
+
+            List<SourceRecord> records = sourceTask.poll();
+
+            assertThat(records).hasSize(3);
+            assertThat(records).element(0).hasFieldOrPropertyWithValue("value", "Test");
+            assertThat(records).element(1).hasFieldOrPropertyWithValue("value", "Test1");
+            assertThat(records).element(2).hasFieldOrPropertyWithValue("value", "Test2");
+        } finally {
+            sourceTask.stop();
+        }
+    }
+    
+    @Test
+    public void testSourcePollingWithAggregationAndIdempotencyBySizeAndTimeout() {
+        final int chunkSize = 2;
+
+        CamelSourceTask sourceTask = new CamelSourceTask();
+        sourceTask.start(mapOf(
+            CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME,
+            CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, DIRECT_URI,
+            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, true,
+            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, "body",
+            CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_CONF, "#class:org.apache.camel.kafkaconnector.utils.StringJoinerAggregator",
+            CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_CONF + ".delimiter", "|",
+            CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_SIZE_CONF, chunkSize
+        ));
+
+        try {
+            assertThat(sourceTask.getCms().getCamelContext().getRegistry().lookupByName(CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_NAME))
+                .isInstanceOf(StringJoinerAggregator.class)
+                .hasFieldOrPropertyWithValue("delimiter", "|");
+
+            sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 0);
+            sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 1);
+            sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 2);
+            sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 3);
+            sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 0);
+            sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 1);
+            sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 3);
+            sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 2);
+            
+            List<SourceRecord> records = sourceTask.poll();
+
+            assertThat(records).hasSize(3);
+            assertThat(records).element(0).hasFieldOrPropertyWithValue("value", "0|1");
+            assertThat(records).element(1).hasFieldOrPropertyWithValue("value", "2|3");
+            assertThat(records).element(2).hasFieldOrPropertyWithValue("value", "3|2");
+        } finally {
+            sourceTask.stop();
+        }
+    }
 }


[camel-kafka-connector] 02/18: fix #692 : Cache already computed Schemas in PojoToSchemaAndStructTransform.

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

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

commit 09491aa383912569ddd5f9d75d903b3e1b536132
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Mon Nov 16 23:38:23 2020 +0100

    fix #692 : Cache already computed Schemas in PojoToSchemaAndStructTransform.
---
 .../transforms/PojoToSchemaAndStructTransform.java | 90 ++++++++++++++++------
 .../PojoToSchemaAndStructTransformTest.java        | 41 +++++++++-
 2 files changed, 104 insertions(+), 27 deletions(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransform.java b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransform.java
index d458636..1ecf48f 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransform.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransform.java
@@ -18,9 +18,13 @@ package org.apache.camel.kafkaconnector.transforms;
 
 import java.io.IOException;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
 
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.dataformat.avro.AvroFactory;
 import com.fasterxml.jackson.dataformat.avro.AvroSchema;
 import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator;
@@ -44,39 +48,54 @@ public class PojoToSchemaAndStructTransform <R extends ConnectRecord<R>> impleme
     private static final ObjectMapper MAPPER = new ObjectMapper(new AvroFactory());
 
     private AvroData avroData;
+    private ConcurrentMap<String, CacheEntry> avroSchemaWrapperCache;
 
     @Override
     public R apply(R r) {
-        LOG.debug("Incoming record: " + r);
+        LOG.debug("Incoming record: {}", r);
 
-        AvroSchemaGenerator gen = new AvroSchemaGenerator();
+        if (r.value() != null) {
+            String recordClassCanonicalName = r.value().getClass().getCanonicalName();
+            CacheEntry cacheEntry = avroSchemaWrapperCache.computeIfAbsent(recordClassCanonicalName, new Function<String, CacheEntry>() {
+                @Override
+                public CacheEntry apply(String s) {
+                    //cache miss
+                    AvroSchemaGenerator gen = new AvroSchemaGenerator();
 
-        try {
-            MAPPER.acceptJsonFormatVisitor(r.value().getClass(), gen);
-        } catch (JsonMappingException e) {
-            throw new ConnectException("Error in generating POJO schema.", e);
-        }
+                    try {
+                        MAPPER.acceptJsonFormatVisitor(r.value().getClass(), gen);
+                    } catch (JsonMappingException e) {
+                        throw new ConnectException("Error in generating POJO schema.", e);
+                    }
 
-        AvroSchema schemaWrapper = gen.getGeneratedSchema();
-        org.apache.avro.Schema avroSchema = schemaWrapper.getAvroSchema();
-        LOG.debug("Generated avro schema: " + avroSchema.toString(true));
+                    AvroSchema schemaWrapper = gen.getGeneratedSchema();
+                    LOG.debug("Generated and cached avro schema: {}", schemaWrapper.getAvroSchema().toString(true));
 
-        SchemaAndValue connectSchemaAndData = null;
-        try {
-            byte[] avroDataByte = MAPPER.writer(schemaWrapper).writeValueAsBytes(r.value());
-            Decoder decoder = DecoderFactory.get().binaryDecoder(avroDataByte, null);
-            DatumReader<GenericRecord> datumReader = new GenericDatumReader<GenericRecord>(avroSchema);
-            GenericRecord genericAvroData = datumReader.read(null, decoder);
+                    return new CacheEntry(schemaWrapper, MAPPER.writer(schemaWrapper));
+                }
+            });
 
-            connectSchemaAndData = this.avroData.toConnectData(avroSchema, genericAvroData);
-        } catch (IOException e) {
-            throw new ConnectException("Error in generating POJO Struct.", e);
-        }
+            SchemaAndValue connectSchemaAndData = null;
+            try {
+                byte[] avroDataByte = cacheEntry.getObjectWriter().writeValueAsBytes(r.value());
+                Decoder decoder = DecoderFactory.get().binaryDecoder(avroDataByte, null);
+                org.apache.avro.Schema avroSchema = cacheEntry.getAvroSchemaWrapper().getAvroSchema();
+                DatumReader<GenericRecord> datumReader = new GenericDatumReader<GenericRecord>(avroSchema);
+                GenericRecord genericAvroData = datumReader.read(null, decoder);
 
-        LOG.debug("Generate kafka connect schema: " + connectSchemaAndData.schema());
-        LOG.debug("Generate kafka connect value (as Struct): " + connectSchemaAndData.value());
-        return r.newRecord(r.topic(), r.kafkaPartition(), r.keySchema(), r.key(),
-                connectSchemaAndData.schema(), connectSchemaAndData.value(), r.timestamp());
+                connectSchemaAndData = this.avroData.toConnectData(avroSchema, genericAvroData);
+            } catch (IOException e) {
+                throw new ConnectException("Error in generating POJO Struct.", e);
+            }
+
+            LOG.debug("Generate kafka connect schema: {}", connectSchemaAndData.schema());
+            LOG.debug("Generate kafka connect value (as Struct): {}", connectSchemaAndData.value());
+            return r.newRecord(r.topic(), r.kafkaPartition(), r.keySchema(), r.key(),
+                    connectSchemaAndData.schema(), connectSchemaAndData.value(), r.timestamp());
+        } else {
+            LOG.debug("Incoming record with a null value, nothing to be done.");
+            return r;
+        }
     }
 
     @Override
@@ -91,6 +110,29 @@ public class PojoToSchemaAndStructTransform <R extends ConnectRecord<R>> impleme
 
     @Override
     public void configure(Map<String, ?> configs) {
+        this.avroSchemaWrapperCache = new ConcurrentHashMap<>();
         this.avroData = new AvroData(new AvroDataConfig(configs));
     }
+
+    public Map<String, CacheEntry> getCache() {
+        return this.avroSchemaWrapperCache;
+    }
+
+    public class CacheEntry {
+        private AvroSchema avroSchemaWrapper;
+        private ObjectWriter objectWriter;
+
+        public CacheEntry(AvroSchema avroSchemaWrapper, ObjectWriter objectWriter) {
+            this.avroSchemaWrapper = avroSchemaWrapper;
+            this.objectWriter = objectWriter;
+        }
+
+        public AvroSchema getAvroSchemaWrapper() {
+            return avroSchemaWrapper;
+        }
+
+        public ObjectWriter getObjectWriter() {
+            return objectWriter;
+        }
+    }
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransformTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransformTest.java
index 9bc617c..e378eab 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransformTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransformTest.java
@@ -122,14 +122,49 @@ public class PojoToSchemaAndStructTransformTest {
                 Schema.STRING_SCHEMA, "testKeyValue",
                 Schema.BYTES_SCHEMA, map);
 
-        assertThrows(ConnectException.class, () -> {pojoToSchemaAndStructTransform.apply(cr);});
+        assertThrows(ConnectException.class, () -> {
+            pojoToSchemaAndStructTransform.apply(cr);
+        });
+    }
+
+    @Test()
+    public void testNullValueConversion() {
+        PojoToSchemaAndStructTransform pojoToSchemaAndStructTransform = new PojoToSchemaAndStructTransform();
+        pojoToSchemaAndStructTransform.configure(Collections.emptyMap());
+
+        ConnectRecord cr = new SourceRecord(null, null, "testTopic",
+                Schema.STRING_SCHEMA, "testKeyValue",
+                Schema.BYTES_SCHEMA, null);
+
+        ConnectRecord transformedCr = pojoToSchemaAndStructTransform.apply(cr);
+        assertEquals(cr, transformedCr);
+    }
+
+    @Test()
+    public void testConversionCache() {
+        PojoToSchemaAndStructTransform pojoToSchemaAndStructTransform = new PojoToSchemaAndStructTransform();
+        pojoToSchemaAndStructTransform.configure(Collections.emptyMap());
+
+        PojoWithMap pwm = new PojoWithMap();
+        pwm.addToMap("ciao", 9);
+
+        ConnectRecord cr = new SourceRecord(null, null, "testTopic",
+                Schema.STRING_SCHEMA, "testKeyValue",
+                Schema.BYTES_SCHEMA, pwm);
+
+        assertEquals(0, pojoToSchemaAndStructTransform.getCache().keySet().size());
+        pojoToSchemaAndStructTransform.apply(cr);
+        assertEquals(1, pojoToSchemaAndStructTransform.getCache().keySet().size());
+        ConnectRecord transformedCr = pojoToSchemaAndStructTransform.apply(cr);
+        assertEquals(1, pojoToSchemaAndStructTransform.getCache().keySet().size());
+        assertTrue(pojoToSchemaAndStructTransform.getCache().keySet().contains(PojoWithMap.class.getCanonicalName()));
     }
 
     private void atLeastOneFieldWithGivenValueExists(List structs, String fieldName, String fieldExpectedValue) {
         structs.stream().filter(
-                struct -> ((Struct) struct).getString(fieldName) == null ? false : true
+            struct -> ((Struct) struct).getString(fieldName) == null ? false : true
         ).forEach(
-                struct -> assertEquals(fieldExpectedValue, ((Struct) struct).getString(fieldName))
+            struct -> assertEquals(fieldExpectedValue, ((Struct) struct).getString(fieldName))
         );
     }
 


[camel-kafka-connector] 04/18: Fixed CS

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

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

commit bbed72ce7e7c48cbd4799b885acecfff32497440
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 17 21:51:54 2020 +0100

    Fixed CS
---
 .../camel/kafkaconnector/CamelSourceTask.java      |  1 +
 .../utils/CamelKafkaConnectMain.java               | 33 ++++++------
 .../camel/kafkaconnector/CamelSinkTaskTest.java    |  1 -
 .../camel/kafkaconnector/CamelSourceTaskTest.java  | 59 +++++++++-------------
 4 files changed, 43 insertions(+), 51 deletions(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
index e32d1c2..4e893ab 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
@@ -95,6 +95,7 @@ public class CamelSourceTask extends SourceTask {
             final String expressionType = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF);
             final String expressionHeader = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF);
             final int memoryDimension = config.getInt(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF);
+            
             topics = config.getString(CamelSourceConnectorConfig.TOPIC_CONF).split(",");
 
             String localUrl = getLocalUrlWithPollingOptions(config);
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index d0695bd..4954ed9 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -146,23 +146,23 @@ public class CamelKafkaConnectMain extends SimpleMain {
         }
         
         public Builder withIdempotencyEnabled(boolean idempotencyEnabled) {
-        	this.idempotencyEnabled = idempotencyEnabled;
-        	return this;
+            this.idempotencyEnabled = idempotencyEnabled;
+            return this;
         }
         
         public Builder withExpressionType(String expressionType) {
-        	this.expressionType = expressionType;
-        	return this;
+            this.expressionType = expressionType;
+            return this;
         }
         
         public Builder withExpressionHeader(String expressionHeader) {
-        	this.expressionHeader = expressionHeader;
-        	return this;
+            this.expressionHeader = expressionHeader;
+            return this;
         }
         
         public Builder withMemoryDimension(int memoryDimension) {
-        	this.memoryDimension = memoryDimension;
-        	return this;
+            this.memoryDimension = memoryDimension;
+            return this;
         }
 
         public CamelKafkaConnectMain build(CamelContext camelContext) {
@@ -211,14 +211,17 @@ public class CamelKafkaConnectMain extends SimpleMain {
                         if (idempotencyEnabled) {
                             switch (expressionType) {
                                 case "body":
-                                    LOG.info(".aggregate({}).constant(true).completionSize({}).completionTimeout({}).idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository({}))", s, aggregationSize, aggregationTimeout, memoryDimension);
+                                    LOG.info(".aggregate({}).constant(true).completionSize({}).completionTimeout({}).idempotentConsumer(body(), + "
+                                           + "MemoryIdempotentRepository.memoryIdempotentRepository({}))", s, aggregationSize, aggregationTimeout, memoryDimension);
                                     LOG.info(".to({})", to);
-                                	rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
+                                    rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
                                     break;
                                 case "header":
-                                    LOG.info(".aggregate({}).constant(true).completionSize({}).completionTimeout({}).idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository({}))", s, aggregationSize, aggregationTimeout, memoryDimension);
+                                    LOG.info(".aggregate({}).constant(true).completionSize({}).completionTimeout({}).idempotentConsumer(header(expressionHeader), + "
+                                           + "MemoryIdempotentRepository.memoryIdempotentRepository({}))", s, aggregationSize, aggregationTimeout, memoryDimension);
                                     LOG.info(".to({})", to);
-                                    rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout).idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
+                                    rd.aggregate(s).constant(true).completionSize(aggregationSize).completionTimeout(aggregationTimeout)
+                                        .idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
                                     break;
                                 default:
                                     break;
@@ -232,11 +235,11 @@ public class CamelKafkaConnectMain extends SimpleMain {
                         if (idempotencyEnabled) {
                             switch (expressionType) {
                                 case "body":
-                                	LOG.info("idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository({})).to({})", memoryDimension, to);
-                                	rd.idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
+                                    LOG.info("idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository({})).to({})", memoryDimension, to);
+                                    rd.idempotentConsumer(body(), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
                                     break;
                                 case "header":
-                                	LOG.info("idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository({})).to({})", memoryDimension, to);
+                                    LOG.info("idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository({})).to({})", memoryDimension, to);
                                     rd.idempotentConsumer(header(expressionHeader), MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension)).toD(to);
                                     break;
                                 default:
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
index 9472206..96e7eb6 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
@@ -32,7 +32,6 @@ import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.SchemaAndValue;
 import org.apache.kafka.connect.data.SchemaBuilder;
 import org.apache.kafka.connect.errors.ConnectException;
-import org.apache.kafka.connect.header.Header;
 import org.apache.kafka.connect.sink.SinkRecord;
 import org.junit.jupiter.api.Test;
 
diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
index ea7bb1b..c6fa7eb 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
@@ -441,19 +441,16 @@ public class CamelSourceTaskTest {
     public void testSourcePollingWithIdempotencyEnabledAndBody() {
 
         CamelSourceTask sourceTask = new CamelSourceTask();
-        sourceTask.start(mapOf(
-            CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME,
-            CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, DIRECT_URI,
-            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, true,
-            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, "body"
-        ));
+        sourceTask.start(mapOf(CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME, CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, DIRECT_URI,
+                               CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, true,
+                               CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, "body"));
 
         try {
 
-        	sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, "Test");
-        	sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, "Test1");
-        	sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, "Test");
-        	sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, "Test2");
+            sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, "Test");
+            sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, "Test1");
+            sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, "Test");
+            sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, "Test2");
 
             List<SourceRecord> records = sourceTask.poll();
 
@@ -465,25 +462,22 @@ public class CamelSourceTaskTest {
             sourceTask.stop();
         }
     }
-    
+
     @Test
     public void testSourcePollingWithIdempotencyEnabledAndHeader() {
 
         CamelSourceTask sourceTask = new CamelSourceTask();
-        sourceTask.start(mapOf(
-            CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME,
-            CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, DIRECT_URI,
-            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, true,
-            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, "header",
-            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF, "headerIdempotency"
-        ));
+        sourceTask
+            .start(mapOf(CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME, CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, DIRECT_URI,
+                         CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, true, CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF,
+                         "header", CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF, "headerIdempotency"));
 
         try {
 
-        	sourceTask.getCms().getProducerTemplate().sendBodyAndHeader(DIRECT_URI, "Test", "headerIdempotency", "Test");
-        	sourceTask.getCms().getProducerTemplate().sendBodyAndHeader(DIRECT_URI, "Test1", "headerIdempotency", "Test1");
-        	sourceTask.getCms().getProducerTemplate().sendBodyAndHeader(DIRECT_URI, "TestTest", "headerIdempotency", "Test");
-        	sourceTask.getCms().getProducerTemplate().sendBodyAndHeader(DIRECT_URI, "Test2", "headerIdempotency", "Test2");
+            sourceTask.getCms().getProducerTemplate().sendBodyAndHeader(DIRECT_URI, "Test", "headerIdempotency", "Test");
+            sourceTask.getCms().getProducerTemplate().sendBodyAndHeader(DIRECT_URI, "Test1", "headerIdempotency", "Test1");
+            sourceTask.getCms().getProducerTemplate().sendBodyAndHeader(DIRECT_URI, "TestTest", "headerIdempotency", "Test");
+            sourceTask.getCms().getProducerTemplate().sendBodyAndHeader(DIRECT_URI, "Test2", "headerIdempotency", "Test2");
 
             List<SourceRecord> records = sourceTask.poll();
 
@@ -495,26 +489,21 @@ public class CamelSourceTaskTest {
             sourceTask.stop();
         }
     }
-    
+
     @Test
     public void testSourcePollingWithAggregationAndIdempotencyBySizeAndTimeout() {
         final int chunkSize = 2;
 
         CamelSourceTask sourceTask = new CamelSourceTask();
-        sourceTask.start(mapOf(
-            CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME,
-            CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, DIRECT_URI,
-            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, true,
-            CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, "body",
-            CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_CONF, "#class:org.apache.camel.kafkaconnector.utils.StringJoinerAggregator",
-            CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_CONF + ".delimiter", "|",
-            CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_SIZE_CONF, chunkSize
-        ));
+        sourceTask
+            .start(mapOf(CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME, CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, DIRECT_URI,
+                         CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, true, CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF,
+                         "body", CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_CONF, "#class:org.apache.camel.kafkaconnector.utils.StringJoinerAggregator",
+                         CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_CONF + ".delimiter", "|", CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_SIZE_CONF, chunkSize));
 
         try {
             assertThat(sourceTask.getCms().getCamelContext().getRegistry().lookupByName(CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_NAME))
-                .isInstanceOf(StringJoinerAggregator.class)
-                .hasFieldOrPropertyWithValue("delimiter", "|");
+                .isInstanceOf(StringJoinerAggregator.class).hasFieldOrPropertyWithValue("delimiter", "|");
 
             sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 0);
             sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 1);
@@ -524,7 +513,7 @@ public class CamelSourceTaskTest {
             sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 1);
             sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 3);
             sourceTask.getCms().getProducerTemplate().sendBody(DIRECT_URI, 2);
-            
+
             List<SourceRecord> records = sourceTask.poll();
 
             assertThat(records).hasSize(3);


[camel-kafka-connector] 08/18: Added Support for KafkaIdempotentRepository

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

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

commit 032c2718aad21e3023a6e88a4a88fc20a789af49
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 19 14:50:31 2020 +0100

    Added Support for KafkaIdempotentRepository
---
 core/pom.xml                                       |  4 +++
 .../camel/kafkaconnector/CamelConnectorConfig.java | 14 +++++++++-
 .../kafkaconnector/CamelSinkConnectorConfig.java   |  5 +++-
 .../apache/camel/kafkaconnector/CamelSinkTask.java |  6 +++++
 .../kafkaconnector/CamelSourceConnectorConfig.java |  5 +++-
 .../camel/kafkaconnector/CamelSourceTask.java      |  6 +++++
 .../utils/CamelKafkaConnectMain.java               | 31 +++++++++++++++++++++-
 7 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index c7ea38d..825f908 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -49,6 +49,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
+            <artifactId>camel-kafka</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
             <artifactId>camel-core-languages</artifactId>
         </dependency>
 
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java
index 0332576..42c9a85 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelConnectorConfig.java
@@ -49,7 +49,11 @@ public abstract class CamelConnectorConfig extends AbstractConfig {
     
     public static final Boolean CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DEFAULT = false;
     public static final String CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF = "camel.idempotency.enabled";
-    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DOC = "If in memory idempotency must be enabled or not";
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DOC = "If idempotency must be enabled or not";
+    
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_REPOSITORY_TYPE_DEFAULT = "memory";
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_REPOSITORY_TYPE_CONF = "camel.idempotency.repository.type";
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_REPOSITORY_TYPE_DOC = "The idempotent repository type to use, possible values are memory and kafka";
     
     public static final String CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_DEFAULT = "body";
     public static final String CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF = "camel.idempotency.expression.type";
@@ -63,6 +67,14 @@ public abstract class CamelConnectorConfig extends AbstractConfig {
     public static final String CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF = "camel.idempotency.memory.dimension";
     public static final String CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DOC = "The Memory dimension of the in memory idempotent Repository";
     
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_DEFAULT = "kafka_idempotent_repository";
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_CONF = "camel.idempotency.kafka.topic";
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_DOC = "The Kafka topic name to use for the idempotent repository";    
+    
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_DEFAULT = "localhost:9092";
+    public static final String CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_CONF = "camel.idempotency.kafka.bootstrap.servers";
+    public static final String  CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_DOC = "A comma-separated list of host and port pairs that are the addresses of the Kafka brokers where the idempotent repository should live"; 
+    
     protected CamelConnectorConfig(ConfigDef definition, Map<?, ?> originals, Map<String, ?> configProviderProps, boolean doLog) {
         super(definition, originals, configProviderProps, doLog);
     }
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
index 299d578..26f9a6f 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkConnectorConfig.java
@@ -61,7 +61,10 @@ public class CamelSinkConnectorConfig extends CamelConnectorConfig {
         .define(CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, Type.BOOLEAN, CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DOC)
         .define(CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_DOC)
         .define(CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_DOC)
-        .define(CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF, Type.INT, CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DOC);
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF, Type.INT, CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_REPOSITORY_TYPE_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_REPOSITORY_TYPE_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_REPOSITORY_TYPE_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_DOC);
     
     public CamelSinkConnectorConfig(ConfigDef config, Map<String, String> parsedConfig) {
         super(config, parsedConfig);
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
index 2cc01a2..256de92 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
@@ -89,6 +89,9 @@ public class CamelSinkTask extends SinkTask {
             final String expressionType = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF);
             final String expressionHeader = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF);
             final int memoryDimension = config.getInt(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF);
+            final String idempotentRepositoryType = config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_REPOSITORY_TYPE_CONF);
+            final String idempotentRepositoryKafkaTopic = config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_CONF);
+            final String idempotentRepositoryBootstrapServers = config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_CONF);
             
             CamelContext camelContext = new DefaultCamelContext();
             if (remoteUrl == null) {
@@ -112,6 +115,9 @@ public class CamelSinkTask extends SinkTask {
                 .withExpressionType(expressionType)
                 .withExpressionHeader(expressionHeader)
                 .withMemoryDimension(memoryDimension)
+                .withIdempotentRepositoryType(idempotentRepositoryType)
+                .withIdempotentRepositoryTopicName(idempotentRepositoryKafkaTopic)
+                .withIdempotentRepositoryKafkaServers(idempotentRepositoryBootstrapServers)
                 .build(camelContext);
 
 
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceConnectorConfig.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceConnectorConfig.java
index 70e2b09..edc8e41 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceConnectorConfig.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceConnectorConfig.java
@@ -97,7 +97,10 @@ public class CamelSourceConnectorConfig extends CamelConnectorConfig {
         .define(CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF, Type.BOOLEAN, CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_DOC)
         .define(CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_DOC)
         .define(CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_DOC)
-        .define(CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF, Type.INT, CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DOC);
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF, Type.INT, CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_REPOSITORY_TYPE_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_REPOSITORY_TYPE_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_REPOSITORY_TYPE_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_DOC)
+        .define(CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_CONF, Type.STRING, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_DEFAULT, Importance.LOW, CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_DOC);
     
     public CamelSourceConnectorConfig(ConfigDef config, Map<String, String> parsedConfig) {
         super(config, parsedConfig);
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
index 4e893ab..439984e 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
@@ -95,6 +95,9 @@ public class CamelSourceTask extends SourceTask {
             final String expressionType = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF);
             final String expressionHeader = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF);
             final int memoryDimension = config.getInt(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF);
+            final String idempotentRepositoryType = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_REPOSITORY_TYPE_CONF);
+            final String idempotentRepositoryKafkaTopic = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_CONF);
+            final String idempotentRepositoryBootstrapServers = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_CONF);
             
             topics = config.getString(CamelSourceConnectorConfig.TOPIC_CONF).split(",");
 
@@ -121,6 +124,9 @@ public class CamelSourceTask extends SourceTask {
                 .withExpressionType(expressionType)
                 .withExpressionHeader(expressionHeader)
                 .withMemoryDimension(memoryDimension)
+                .withIdempotentRepositoryType(idempotentRepositoryType)
+                .withIdempotentRepositoryTopicName(idempotentRepositoryKafkaTopic)
+                .withIdempotentRepositoryKafkaServers(idempotentRepositoryBootstrapServers)
                 .build(camelContext);
 
             consumer = cms.getCamelContext().getEndpoint(localUrl).createPollingConsumer();
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index bebe4a9..8f95655 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -28,6 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.kafkaconnector.CamelConnectorConfig;
 import org.apache.camel.main.SimpleMain;
 import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.processor.idempotent.kafka.KafkaIdempotentRepository;
 import org.apache.camel.spi.IdempotentRepository;
 import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
 import org.apache.camel.support.service.ServiceHelper;
@@ -100,6 +101,9 @@ public class CamelKafkaConnectMain extends SimpleMain {
         private String expressionType;
         private String expressionHeader;
         private int memoryDimension;
+        private String idempotentRepositoryType;
+        private String idempotentRepositoryTopicName;
+        private String idempotentRepositoryKafkaServers;
 
         public Builder(String from, String to) {
             this.from = from;
@@ -165,6 +169,21 @@ public class CamelKafkaConnectMain extends SimpleMain {
             this.memoryDimension = memoryDimension;
             return this;
         }
+        
+        public Builder withIdempotentRepositoryType(String idempotentRepositoryType) {
+            this.idempotentRepositoryType = idempotentRepositoryType;
+            return this;
+        }
+        
+        public Builder withIdempotentRepositoryTopicName(String idempotentRepositoryTopicName) {
+            this.idempotentRepositoryTopicName = idempotentRepositoryTopicName;
+            return this;
+        }
+        
+        public Builder withIdempotentRepositoryKafkaServers(String idempotentRepositoryKafkaServers) {
+            this.idempotentRepositoryKafkaServers = idempotentRepositoryKafkaServers;
+            return this;
+        }
 
         public CamelKafkaConnectMain build(CamelContext camelContext) {
             CamelKafkaConnectMain camelMain = new CamelKafkaConnectMain(camelContext);
@@ -178,7 +197,17 @@ public class CamelKafkaConnectMain extends SimpleMain {
             
             // Instantianting the idempotent Repository here and inject it in registry to be referenced
             if (idempotencyEnabled) {
-                IdempotentRepository idempotentRepo = MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension);
+                IdempotentRepository idempotentRepo = null;
+                switch (idempotentRepositoryType) {
+                    case "memory":
+                        idempotentRepo = MemoryIdempotentRepository.memoryIdempotentRepository(memoryDimension);
+                        break;
+                    case "kafka":
+                	    idempotentRepo = new KafkaIdempotentRepository(idempotentRepositoryTopicName, idempotentRepositoryKafkaServers);
+                	    break;
+                    default:
+                        break;
+                }
                 camelMain.getCamelContext().getRegistry().bind("idempotentRepository", idempotentRepo);
             }
 


[camel-kafka-connector] 05/18: Use the errorHandler variable coming from Builder

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

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

commit 922a823280b7a01ff983c2c6af74682c1e0fa864
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Nov 18 07:44:32 2020 +0100

    Use the errorHandler variable coming from Builder
---
 .../org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index 4954ed9..acc97ca 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -182,8 +182,7 @@ public class CamelKafkaConnectMain extends SimpleMain {
                     RouteDefinition rd = from(from);
                     LOG.info("Creating Camel route from({})", from);
                     
-                    if (!ObjectHelper.isEmpty(props.get(CamelConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_CONF))) {
-                        String errorHandler = props.get(CamelConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_CONF);
+                    if (!ObjectHelper.isEmpty(errorHandler)) {
                         switch (errorHandler) {
                             case "no":
                                 rd.errorHandler(noErrorHandler());


[camel-kafka-connector] 12/18: Fixed wrong config references in both CamelSinkTask and CamelSourceTask

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

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

commit 81c2f32b0642dd5aa67917fdaa5f3da0259a97d6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Nov 20 15:05:55 2020 +0100

    Fixed wrong config references in both CamelSinkTask and CamelSourceTask
---
 .../main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java  | 8 ++++----
 .../java/org/apache/camel/kafkaconnector/CamelSourceTask.java     | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
index 256de92..21b6aa4 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
@@ -85,10 +85,10 @@ public class CamelSinkTask extends SinkTask {
             final int maxRedeliveries = config.getInt(CamelSinkConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_CONF);
             final long redeliveryDelay = config.getLong(CamelSinkConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_CONF);
             final String errorHandler = config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_CONF);
-            final Boolean idempotencyEnabled = config.getBoolean(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF);
-            final String expressionType = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF);
-            final String expressionHeader = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF);
-            final int memoryDimension = config.getInt(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF);
+            final Boolean idempotencyEnabled = config.getBoolean(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF);
+            final String expressionType = config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF);
+            final String expressionHeader = config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF);
+            final int memoryDimension = config.getInt(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_MEMORY_DIMENSION_CONF);
             final String idempotentRepositoryType = config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_REPOSITORY_TYPE_CONF);
             final String idempotentRepositoryKafkaTopic = config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_TOPIC_CONF);
             final String idempotentRepositoryBootstrapServers = config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_KAFKA_BOOTSTRAP_SERVERS_CONF);
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
index 439984e..dd2ddc9 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
@@ -88,9 +88,9 @@ public class CamelSourceTask extends SourceTask {
             final String marshaller = config.getString(CamelSourceConnectorConfig.CAMEL_SOURCE_MARSHAL_CONF);
             final int size = config.getInt(CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_SIZE_CONF);
             final long timeout = config.getLong(CamelSourceConnectorConfig.CAMEL_CONNECTOR_AGGREGATE_TIMEOUT_CONF);
-            final int maxRedeliveries = config.getInt(CamelSinkConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_CONF);
-            final long redeliveryDelay = config.getLong(CamelSinkConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_CONF);
-            final String errorHandler = config.getString(CamelSinkConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_CONF);
+            final int maxRedeliveries = config.getInt(CamelSourceConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_MAXIMUM_REDELIVERIES_CONF);
+            final long redeliveryDelay = config.getLong(CamelSourceConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_REDELIVERY_DELAY_CONF);
+            final String errorHandler = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_ERROR_HANDLER_CONF);
             final Boolean idempotencyEnabled = config.getBoolean(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_ENABLED_CONF);
             final String expressionType = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_TYPE_CONF);
             final String expressionHeader = config.getString(CamelSourceConnectorConfig.CAMEL_CONNECTOR_IDEMPOTENCY_EXPRESSION_HEADER_CONF);


[camel-kafka-connector] 01/18: Enanched unit tests for PojoToSchemaAndStructTransform

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

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

commit 8d2682739d24b94e7e45e52446d723701e6f014f
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue Nov 10 17:38:36 2020 +0100

    Enanched unit tests for PojoToSchemaAndStructTransform
---
 .../PojoToSchemaAndStructTransformTest.java        | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransformTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransformTest.java
index 8712145..9bc617c 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransformTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/transforms/PojoToSchemaAndStructTransformTest.java
@@ -19,16 +19,19 @@ package org.apache.camel.kafkaconnector.transforms;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.camel.component.slack.helper.SlackMessage;
 import org.apache.kafka.connect.connector.ConnectRecord;
 import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.Struct;
+import org.apache.kafka.connect.errors.ConnectException;
 import org.apache.kafka.connect.source.SourceRecord;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class PojoToSchemaAndStructTransformTest {
@@ -69,9 +72,15 @@ public class PojoToSchemaAndStructTransformTest {
         assertEquals(Schema.Type.STRUCT, transformedSchema.type());
         assertEquals(Schema.Type.ARRAY, transformedSchema.field("attachments").schema().type());
         assertEquals(Schema.STRING_SCHEMA.type(), transformedSchema.field("attachments").schema().valueSchema().field("title").schema().type());
+
         assertEquals(Struct.class, transformedCr.value().getClass());
         Struct transformedValue = (Struct)transformedCr.value();
         assertTrue(ArrayList.class.isAssignableFrom(transformedValue.get("attachments").getClass()));
+        List actualAttachments = (ArrayList)transformedValue.get("attachments");
+        assertEquals(2, actualAttachments.size());
+        assertEquals(Struct.class, actualAttachments.get(0).getClass());
+        atLeastOneFieldWithGivenValueExists(actualAttachments, "authorName", "Andrea");
+        atLeastOneFieldWithGivenValueExists(actualAttachments, "color", "green");
     }
 
     @Test
@@ -94,9 +103,34 @@ public class PojoToSchemaAndStructTransformTest {
         Schema transformedSchema = transformedCr.valueSchema();
         assertEquals(Schema.Type.STRUCT, transformedSchema.type());
         assertEquals(Schema.Type.MAP, transformedSchema.field("map").schema().type());
+
         assertEquals(Struct.class, transformedCr.value().getClass());
         Struct transformedValue = (Struct)transformedCr.value();
         assertTrue(Map.class.isAssignableFrom(transformedValue.get("map").getClass()));
+        assertTrue(((Map)transformedValue.get("map")).keySet().contains("ciao"));
+        assertTrue(((Map)transformedValue.get("map")).values().contains(9));
+    }
+
+    @Test()
+    public void testNotPojoConversion() {
+        PojoToSchemaAndStructTransform pojoToSchemaAndStructTransform = new PojoToSchemaAndStructTransform();
+        pojoToSchemaAndStructTransform.configure(Collections.emptyMap());
+
+        Map map = Collections.singletonMap("ciao", 9);
+
+        ConnectRecord cr = new SourceRecord(null, null, "testTopic",
+                Schema.STRING_SCHEMA, "testKeyValue",
+                Schema.BYTES_SCHEMA, map);
+
+        assertThrows(ConnectException.class, () -> {pojoToSchemaAndStructTransform.apply(cr);});
+    }
+
+    private void atLeastOneFieldWithGivenValueExists(List structs, String fieldName, String fieldExpectedValue) {
+        structs.stream().filter(
+                struct -> ((Struct) struct).getString(fieldName) == null ? false : true
+        ).forEach(
+                struct -> assertEquals(fieldExpectedValue, ((Struct) struct).getString(fieldName))
+        );
     }
 
     public class PojoWithMap {


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

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

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

commit 363edca93b7d3bf14d698924e351cd7b77269cd1
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 6218719..5abbd7a 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 1d3514b..94e6b0b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ssh-source.json
@@ -80,13 +80,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.channelType": {
 			"name": "camel.source.endpoint.channelType",
 			"description": "Sets the channel type to pass to the Channel as part of command execution. Defaults to exec.",
@@ -276,11 +269,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ssh.basicPropertyBinding": {
-			"name": "camel.component.ssh.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ssh.autowiredEnabled": {
+			"name": "camel.component.ssh.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ssh.channelType": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stax-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stax-sink.json
index dfb4d82..2e225c4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stax-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stax-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -43,11 +36,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stax.basicPropertyBinding": {
-			"name": "camel.component.stax.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stax.autowiredEnabled": {
+			"name": "camel.component.stax.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-sink.json
index 4f995c8..ea05c93 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -117,11 +110,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stomp.basicPropertyBinding": {
-			"name": "camel.component.stomp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stomp.autowiredEnabled": {
+			"name": "camel.component.stomp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.stomp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-source.json
index 2a0f2ab..9b11659 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stomp-source.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -129,11 +122,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stomp.basicPropertyBinding": {
-			"name": "camel.component.stomp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stomp.autowiredEnabled": {
+			"name": "camel.component.stomp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.stomp.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-sink.json
index 382f981..645a855 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-sink.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.readTimeout": {
 			"name": "camel.sink.endpoint.readTimeout",
 			"description": "Sets the read timeout to a specified timeout, in milliseconds. A non-zero value specifies the timeout when reading from Input stream when a connection is established to a resource. If the timeout expires before there is data available for read, a java.net.SocketTimeoutException is raised. A timeout of zero is interpreted as an infinite timeout.",
@@ -80,11 +73,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stream.basicPropertyBinding": {
-			"name": "camel.component.stream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stream.autowiredEnabled": {
+			"name": "camel.component.stream.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-source.json
index c6e9faf..18e3ccb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stream-source.json
@@ -104,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.readTimeout": {
 			"name": "camel.source.endpoint.readTimeout",
 			"description": "Sets the read timeout to a specified timeout, in milliseconds. A non-zero value specifies the timeout when reading from Input stream when a connection is established to a resource. If the timeout expires before there is data available for read, a java.net.SocketTimeoutException is raised. A timeout of zero is interpreted as an infinite timeout.",
@@ -131,11 +124,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stream.basicPropertyBinding": {
-			"name": "camel.component.stream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stream.autowiredEnabled": {
+			"name": "camel.component.stream.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-string-template-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-string-template-sink.json
index 9ad74d7..5ba661d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-string-template-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-string-template-sink.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.string-template.basicPropertyBinding": {
-			"name": "camel.component.string-template.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.string-template.autowiredEnabled": {
+			"name": "camel.component.string-template.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-sink.json
index 61c678f..a96989d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.queue": {
 			"name": "camel.sink.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -124,11 +117,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stub.basicPropertyBinding": {
-			"name": "camel.component.stub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stub.autowiredEnabled": {
+			"name": "camel.component.stub.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.stub.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-source.json
index bc5d0d0..60194ca 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-stub-source.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.queue": {
 			"name": "camel.source.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.stub.basicPropertyBinding": {
-			"name": "camel.component.stub.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.stub.autowiredEnabled": {
+			"name": "camel.component.stub.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.stub.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-sink.json
index 65b14bb..06ffe3a 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "The initial in-memory buffer size used when transferring data between Camel and AHC Client.",
@@ -93,6 +86,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.telegram.autowiredEnabled": {
+			"name": "camel.component.telegram.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.telegram.baseUri": {
 			"name": "camel.component.telegram.baseUri",
 			"description": "Can be used to set an alternative base URI, e.g. when you want to test the component against a mock Telegram API",
@@ -100,13 +100,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.telegram.basicPropertyBinding": {
-			"name": "camel.component.telegram.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
-			"required": "false"
-		},
 		"camel.component.telegram.client": {
 			"name": "camel.component.telegram.client",
 			"description": "To use a custom AsyncHttpClient",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-source.json
index 1a8eb7f..8e28cbb 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-telegram-source.json
@@ -67,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bufferSize": {
 			"name": "camel.source.endpoint.bufferSize",
 			"description": "The initial in-memory buffer size used when transferring data between Camel and AHC Client.",
@@ -219,6 +212,13 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.telegram.autowiredEnabled": {
+			"name": "camel.component.telegram.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.telegram.baseUri": {
 			"name": "camel.component.telegram.baseUri",
 			"description": "Can be used to set an alternative base URI, e.g. when you want to test the component against a mock Telegram API",
@@ -226,13 +226,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.telegram.basicPropertyBinding": {
-			"name": "camel.component.telegram.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
-			"required": "false"
-		},
 		"camel.component.telegram.client": {
 			"name": "camel.component.telegram.client",
 			"description": "To use a custom AsyncHttpClient",
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-sink.json
index da182d4..de612b6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-sink.json
@@ -54,13 +54,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -88,11 +81,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.thrift.basicPropertyBinding": {
-			"name": "camel.component.thrift.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.thrift.autowiredEnabled": {
+			"name": "camel.component.thrift.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.thrift.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-source.json
index c13a210..5424c51 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-thrift-source.json
@@ -80,13 +80,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -114,11 +107,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.thrift.basicPropertyBinding": {
-			"name": "camel.component.thrift.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.thrift.autowiredEnabled": {
+			"name": "camel.component.thrift.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.thrift.useGlobalSslContextParameters": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-tika-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-tika-sink.json
index adbcd54..97fce81 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-tika-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-tika-sink.json
@@ -47,13 +47,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -68,11 +61,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.tika.basicPropertyBinding": {
-			"name": "camel.component.tika.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.tika.autowiredEnabled": {
+			"name": "camel.component.tika.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-timer-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-timer-source.json
index d5fe76e..e10514b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-timer-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-timer-source.json
@@ -69,13 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.daemon": {
 			"name": "camel.source.endpoint.daemon",
 			"description": "Specifies whether or not the thread associated with the timer endpoint runs as a daemon. The default value is true.",
@@ -115,11 +108,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.timer.basicPropertyBinding": {
-			"name": "camel.component.timer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.timer.autowiredEnabled": {
+			"name": "camel.component.timer.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-sink.json
index 76a3b70..efd7909 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -61,11 +54,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twilio.basicPropertyBinding": {
-			"name": "camel.component.twilio.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twilio.autowiredEnabled": {
+			"name": "camel.component.twilio.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twilio.restClient": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-source.json
index 76e1d7a..510d4a3 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twilio-source.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -179,11 +172,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twilio.basicPropertyBinding": {
-			"name": "camel.component.twilio.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twilio.autowiredEnabled": {
+			"name": "camel.component.twilio.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twilio.restClient": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-sink.json
index 7a12455..634082d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-directmessage.basicPropertyBinding": {
-			"name": "camel.component.twitter-directmessage.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-directmessage.autowiredEnabled": {
+			"name": "camel.component.twitter-directmessage.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-directmessage.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-source.json
index 885f231..e0b196c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-directmessage-source.json
@@ -92,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -301,11 +294,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-directmessage.basicPropertyBinding": {
-			"name": "camel.component.twitter-directmessage.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-directmessage.autowiredEnabled": {
+			"name": "camel.component.twitter-directmessage.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-directmessage.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-sink.json
index fb73df2..79cffe0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -91,11 +84,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-search.basicPropertyBinding": {
-			"name": "camel.component.twitter-search.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-search.autowiredEnabled": {
+			"name": "camel.component.twitter-search.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-search.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-source.json
index 8cd3f9f..4b15427 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-search-source.json
@@ -92,13 +92,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -301,11 +294,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-search.basicPropertyBinding": {
-			"name": "camel.component.twitter-search.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-search.autowiredEnabled": {
+			"name": "camel.component.twitter-search.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-search.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-sink.json
index 96498d5..0089c6e 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -97,11 +90,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-timeline.basicPropertyBinding": {
-			"name": "camel.component.twitter-timeline.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-timeline.autowiredEnabled": {
+			"name": "camel.component.twitter-timeline.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-timeline.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-source.json
index 1725485..88a5b8c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-twitter-timeline-source.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -307,11 +300,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.twitter-timeline.basicPropertyBinding": {
-			"name": "camel.component.twitter-timeline.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.twitter-timeline.autowiredEnabled": {
+			"name": "camel.component.twitter-timeline.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.twitter-timeline.httpProxyHost": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-sink.json
index 8705961..f31c59c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-sink.json
@@ -89,13 +89,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.headerFilterStrategy": {
 			"name": "camel.sink.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -159,11 +152,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.undertow.basicPropertyBinding": {
-			"name": "camel.component.undertow.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.undertow.autowiredEnabled": {
+			"name": "camel.component.undertow.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.undertow.hostOptions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-source.json
index 115124a..e055678 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-undertow-source.json
@@ -87,13 +87,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.headerFilterStrategy": {
 			"name": "camel.source.endpoint.headerFilterStrategy",
 			"description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
@@ -158,11 +151,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.undertow.basicPropertyBinding": {
-			"name": "camel.component.undertow.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.undertow.autowiredEnabled": {
+			"name": "camel.component.undertow.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.undertow.hostOptions": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-validator-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-validator-sink.json
index 872a152..7e37ba2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-validator-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-validator-sink.json
@@ -42,13 +42,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.errorHandler": {
 			"name": "camel.sink.endpoint.errorHandler",
 			"description": "To use a custom org.apache.camel.processor.validation.ValidatorErrorHandler. The default error handler captures the errors and throws an exception.",
@@ -101,11 +94,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.validator.basicPropertyBinding": {
-			"name": "camel.component.validator.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.validator.autowiredEnabled": {
+			"name": "camel.component.validator.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.validator.resourceResolverFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-velocity-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-velocity-sink.json
index 34dff21..81cf1fc 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-velocity-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-velocity-sink.json
@@ -62,13 +62,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -97,11 +90,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.velocity.basicPropertyBinding": {
-			"name": "camel.component.velocity.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.velocity.autowiredEnabled": {
+			"name": "camel.component.velocity.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.velocity.velocityEngine": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json
index 14647ad..42f2722 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-http-sink.json
@@ -103,13 +103,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -185,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx-http.basicPropertyBinding": {
-			"name": "camel.component.vertx-http.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx-http.autowiredEnabled": {
+			"name": "camel.component.vertx-http.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx-http.vertx": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-sink.json
index 414fc20..b7644f6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -80,11 +73,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx.basicPropertyBinding": {
-			"name": "camel.component.vertx.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx.autowiredEnabled": {
+			"name": "camel.component.vertx.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx.vertxFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-source.json
index f9c4cf0..70f8343 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-source.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx.basicPropertyBinding": {
-			"name": "camel.component.vertx.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx.autowiredEnabled": {
+			"name": "camel.component.vertx.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx.vertxFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
index e1bc267..9da5a2b 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-sink.json
@@ -56,13 +56,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -83,11 +76,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx-websocket.basicPropertyBinding": {
-			"name": "camel.component.vertx-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx-websocket.autowiredEnabled": {
+			"name": "camel.component.vertx-websocket.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx-websocket.router": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-source.json
index 8838c85..f5e6be9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vertx-websocket-source.json
@@ -67,13 +67,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -94,11 +87,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vertx-websocket.basicPropertyBinding": {
-			"name": "camel.component.vertx-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vertx-websocket.autowiredEnabled": {
+			"name": "camel.component.vertx-websocket.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vertx-websocket.router": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-sink.json
index 2a5838b..b950983 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-sink.json
@@ -77,13 +77,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.queue": {
 			"name": "camel.sink.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -124,11 +117,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vm.basicPropertyBinding": {
-			"name": "camel.component.vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vm.autowiredEnabled": {
+			"name": "camel.component.vm.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vm.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-source.json
index e3dfec7..5076ed2 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-vm-source.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.queue": {
 			"name": "camel.source.endpoint.queue",
 			"description": "Define the queue instance which will be used by the endpoint",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.vm.basicPropertyBinding": {
-			"name": "camel.component.vm.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.vm.autowiredEnabled": {
+			"name": "camel.component.vm.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.vm.defaultQueueFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-sink.json
index c6e55eb..6a238e1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.geoLocationProvider": {
 			"name": "camel.sink.endpoint.geoLocationProvider",
 			"description": "A custum geolocation provider to determine the longitude and latitude to use when no location information is set. The default implementaion uses the ipstack API and requires geolocationAccessKey and geolocationRequestHostIP",
@@ -165,11 +158,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.weather.basicPropertyBinding": {
-			"name": "camel.component.weather.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.weather.autowiredEnabled": {
+			"name": "camel.component.weather.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-source.json
index a21f9e3..d1fb6c0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weather-source.json
@@ -91,13 +91,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.geoLocationProvider": {
 			"name": "camel.source.endpoint.geoLocationProvider",
 			"description": "A custum geolocation provider to determine the longitude and latitude to use when no location information is set. The default implementaion uses the ipstack API and requires geolocationAccessKey and geolocationRequestHostIP",
@@ -283,11 +276,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.weather.basicPropertyBinding": {
-			"name": "camel.component.weather.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.weather.autowiredEnabled": {
+			"name": "camel.component.weather.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-sink.json
index c151895..a3068a0 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-sink.json
@@ -232,13 +232,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -469,11 +462,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.web3j.basicPropertyBinding": {
-			"name": "camel.component.web3j.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.web3j.autowiredEnabled": {
+			"name": "camel.component.web3j.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-source.json
index deb58d1..5ea34cd 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-web3j-source.json
@@ -104,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -201,11 +194,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.web3j.basicPropertyBinding": {
-			"name": "camel.component.web3j.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.web3j.autowiredEnabled": {
+			"name": "camel.component.web3j.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-webhook-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-webhook-source.json
index 1a65805..df83565 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-webhook-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-webhook-source.json
@@ -65,13 +65,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -117,11 +110,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.webhook.basicPropertyBinding": {
-			"name": "camel.component.webhook.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.webhook.autowiredEnabled": {
+			"name": "camel.component.webhook.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.webhook.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-sink.json
index 50c6d0c..7e8e7ea 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-sink.json
@@ -29,13 +29,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -50,11 +43,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.websocket-jsr356.basicPropertyBinding": {
-			"name": "camel.component.websocket-jsr356.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.websocket-jsr356.autowiredEnabled": {
+			"name": "camel.component.websocket-jsr356.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.websocket-jsr356.serverEndpointDeploymentStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-source.json
index 4619f49..59d73b4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-jsr356-source.json
@@ -41,13 +41,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -62,11 +55,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.websocket-jsr356.basicPropertyBinding": {
-			"name": "camel.component.websocket-jsr356.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.websocket-jsr356.autowiredEnabled": {
+			"name": "camel.component.websocket-jsr356.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.websocket-jsr356.serverEndpointDeploymentStrategy": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-sink.json
index 80713af..059e3ce 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-sink.json
@@ -56,13 +56,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.bufferSize": {
 			"name": "camel.sink.endpoint.bufferSize",
 			"description": "Set the buffer size of the websocketServlet, which is also the max frame byte size (default 8192)",
@@ -150,11 +143,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.websocket.basicPropertyBinding": {
-			"name": "camel.component.websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.websocket.autowiredEnabled": {
+			"name": "camel.component.websocket.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.websocket.enableJmx": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-source.json
index b6b8aaa..4ebf7b4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-websocket-source.json
@@ -68,13 +68,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.bufferSize": {
 			"name": "camel.source.endpoint.bufferSize",
 			"description": "Set the buffer size of the websocketServlet, which is also the max frame byte size (default 8192)",
@@ -168,11 +161,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.websocket.basicPropertyBinding": {
-			"name": "camel.component.websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.websocket.autowiredEnabled": {
+			"name": "camel.component.websocket.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.websocket.enableJmx": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weka-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weka-sink.json
index 03bc98f..74c1808 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weka-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-weka-sink.json
@@ -22,13 +22,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -100,11 +93,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.weka.basicPropertyBinding": {
-			"name": "camel.component.weka.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.weka.autowiredEnabled": {
+			"name": "camel.component.weka.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-sink.json
index b60bd00..e9d214d 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -155,11 +148,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.wordpress.basicPropertyBinding": {
-			"name": "camel.component.wordpress.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.wordpress.autowiredEnabled": {
+			"name": "camel.component.wordpress.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-source.json
index 597d35d..09a3494 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-wordpress-source.json
@@ -90,13 +90,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -167,11 +160,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.wordpress.basicPropertyBinding": {
-			"name": "camel.component.wordpress.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.wordpress.autowiredEnabled": {
+			"name": "camel.component.wordpress.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index 7316923..9b381c5 100644
--- a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++ b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -60,7 +60,7 @@ class CamelKafkaConnectorCatalogTest {
         assertEquals("org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SinkConnector", model.getConnectorClass());
         assertEquals("camel.sink.path.bucketNameOrArn", model.getOptions().get(0).getName());
         assertEquals("camel.sink.endpoint.amazonS3Client", model.getOptions().get(1).getName());
-        assertEquals("camel.sink.endpoint.amazonS3Presigner", model.getOptions().get(2).getName());
+        assertEquals("camel.sink.endpoint.autoCreateBucket", model.getOptions().get(2).getName());
         assertEquals(1, model.getConverters().size());
         assertEquals(1, model.getTransforms().size());
         assertNull(model.getAggregationStrategies());


[camel-kafka-connector] 11/18: Prevent NPEs in the (unlikely) case the record value is null

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

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

commit b5bf4a54bcdd9dd40e043ebbebabd0a9c80979e6
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Fri Nov 20 12:31:18 2020 +0100

    Prevent NPEs in the (unlikely) case the record value is null
---
 .../kafkaconnector/ftp/transformers/FtpRemoteFileTransforms.java    | 4 ++--
 .../kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java  | 6 +++---
 .../kafkaconnector/sftp/transformers/SftpRemoteFileTransforms.java  | 6 +++---
 .../camel/kafkaconnector/slack/transformers/SlackTransforms.java    | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/connectors/camel-ftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftp/transformers/FtpRemoteFileTransforms.java b/connectors/camel-ftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftp/transformers/FtpRemoteFileTransforms.java
index 89db9d1..55da442 100644
--- a/connectors/camel-ftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftp/transformers/FtpRemoteFileTransforms.java
+++ b/connectors/camel-ftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftp/transformers/FtpRemoteFileTransforms.java
@@ -40,7 +40,7 @@ public class FtpRemoteFileTransforms <R extends ConnectRecord<R>> implements Tra
 
         if (r.value() instanceof RemoteFile) {
             LOG.debug("Converting record from RemoteFile to text");
-            RemoteFile message = (RemoteFile) r.value();
+            RemoteFile message = (RemoteFile) value;
 
             LOG.debug("Received text: {}", message.getBody());
 
@@ -48,7 +48,7 @@ public class FtpRemoteFileTransforms <R extends ConnectRecord<R>> implements Tra
                     SchemaHelper.buildSchemaBuilderForType(message.getBody()), message.getBody(), r.timestamp());
 
         } else {
-            LOG.debug("Unexpected message type: {}", r.value().getClass());
+            LOG.debug("Unexpected message type: {}", value == null ? "null instance" : value.getClass());
 
             return r;
         }
diff --git a/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java b/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java
index 7d9d13c..dc97303 100644
--- a/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java
+++ b/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java
@@ -38,9 +38,9 @@ public class FtpsRemoteFileTransforms <R extends ConnectRecord<R>> implements Tr
     public R apply(R r) {
         Object value = r.value();
 
-        if (r.value() instanceof RemoteFile) {
+        if (value instanceof RemoteFile) {
             LOG.debug("Converting record from RemoteFile to text");
-            RemoteFile message = (RemoteFile) r.value();
+            RemoteFile message = (RemoteFile) value;
 
             LOG.debug("Received text: {}", message.getBody());
 
@@ -48,7 +48,7 @@ public class FtpsRemoteFileTransforms <R extends ConnectRecord<R>> implements Tr
                     SchemaHelper.buildSchemaBuilderForType(message.getBody()), message.getBody(), r.timestamp());
 
         } else {
-            LOG.debug("Unexpected message type: {}", r.value().getClass());
+            LOG.debug("Unexpected message type: {}", value == null ? "null instance" : value.getClass());
 
             return r;
         }
diff --git a/connectors/camel-sftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sftp/transformers/SftpRemoteFileTransforms.java b/connectors/camel-sftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sftp/transformers/SftpRemoteFileTransforms.java
index 4d3c98e..2c67f99 100644
--- a/connectors/camel-sftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sftp/transformers/SftpRemoteFileTransforms.java
+++ b/connectors/camel-sftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sftp/transformers/SftpRemoteFileTransforms.java
@@ -38,9 +38,9 @@ public class SftpRemoteFileTransforms <R extends ConnectRecord<R>> implements Tr
     public R apply(R r) {
         Object value = r.value();
 
-        if (r.value() instanceof RemoteFile) {
+        if (value instanceof RemoteFile) {
             LOG.debug("Converting record from RemoteFile to text");
-            RemoteFile message = (RemoteFile) r.value();
+            RemoteFile message = (RemoteFile) value;
 
             LOG.debug("Received text: {}", message.getBody());
 
@@ -48,7 +48,7 @@ public class SftpRemoteFileTransforms <R extends ConnectRecord<R>> implements Tr
                     SchemaHelper.buildSchemaBuilderForType(message.getBody()), message.getBody(), r.timestamp());
 
         } else {
-            LOG.debug("Unexpected message type: {}", r.value().getClass());
+            LOG.debug("Unexpected message type: {}", value == null ? "null instance" : value.getClass());
 
             return r;
         }
diff --git a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/transformers/SlackTransforms.java b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/transformers/SlackTransforms.java
index a0de8d2..b39a36e 100644
--- a/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/transformers/SlackTransforms.java
+++ b/connectors/camel-slack-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/slack/transformers/SlackTransforms.java
@@ -39,9 +39,9 @@ public class SlackTransforms <R extends ConnectRecord<R>> implements Transformat
     public R apply(R r) {
         Object value = r.value();
 
-        if (r.value() instanceof SlackMessage) {
+        if (value instanceof SlackMessage) {
             LOG.debug("Converting record from SlackMessage to text");
-            SlackMessage message = (SlackMessage) r.value();
+            SlackMessage message = (SlackMessage) value;
 
             LOG.debug("Received text: {}", message.getText());
 
@@ -49,7 +49,7 @@ public class SlackTransforms <R extends ConnectRecord<R>> implements Transformat
                     SchemaHelper.buildSchemaBuilderForType(message.getText()), message.getText(), r.timestamp());
 
         } else {
-            LOG.debug("Unexpected message type: {}", r.value().getClass());
+            LOG.debug("Unexpected message type: {}", value == null ? "null instance" : value.getClass());
 
             return r;
         }


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

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

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

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

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

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


[camel-kafka-connector] 10/18: Added documentation for idempotency in basic configuration docs

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

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

commit 85f54c301af647216b926ac9ec76d980d79420b6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Nov 20 12:03:03 2020 +0100

    Added documentation for idempotency in basic configuration docs
---
 docs/modules/ROOT/pages/basic-configuration.adoc | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/modules/ROOT/pages/basic-configuration.adoc b/docs/modules/ROOT/pages/basic-configuration.adoc
index d985357..89f88e9 100644
--- a/docs/modules/ROOT/pages/basic-configuration.adoc
+++ b/docs/modules/ROOT/pages/basic-configuration.adoc
@@ -17,6 +17,13 @@ For a Sink connector the basic options are:
 | camel.error.handler | The error handler to use: possible value are 'no' or 'default' | default | MEDIUM
 | camel.error.handler.max.redeliveries | The maximum redeliveries to be use in case of Default Error Handler | 0 | MEDIUM
 | camel.error.handler.redelivery.delay | The initial redelivery delay in milliseconds in case of Default Error Handler | 1000L | MEDIUM
+| camel.idempotency.enabled | If idempotency must be enabled or not | false | LOW
+| camel.idempotency.repository.type | The idempotent repository type to use, possible values are memory and kafka | memory | LOW
+| camel.idempotency.expression.type | How the idempotency will be evaluated: possible values are body and header | body | LOW
+| camel.idempotency.expression.header | The header name that will be evaluated in case of camel.idempotency.expression.type equals to header | null | LOW
+| camel.idempotency.memory.dimension | The Memory dimension of the in memory idempotent Repository | 100 | LOW
+| camel.idempotency.kafka.topic | The Kafka topic name to use for the idempotent repository | kafka_idempotent_repository | LOW
+| camel.idempotency.kafka.bootstrap.servers | A comma-separated list of host and port pairs that are the addresses of the Kafka brokers where the idempotent repository should live | localhost:9092 | LOW
 |===
 
 For a Source connector the basic options are:
@@ -39,6 +46,13 @@ For a Source connector the basic options are:
 | camel.error.handler | The error handler to use: possible value are 'no' or 'default' | default | MEDIUM
 | camel.error.handler.max.redeliveries | The maximum redeliveries to be use in case of Default Error Handler | 0 | MEDIUM
 | camel.error.handler.redelivery.delay | The initial redelivery delay in milliseconds in case of Default Error Handler | 1000L | MEDIUM
+| camel.idempotency.enabled | If idempotency must be enabled or not | false | LOW
+| camel.idempotency.repository.type | The idempotent repository type to use, possible values are memory and kafka | memory | LOW
+| camel.idempotency.expression.type | How the idempotency will be evaluated: possible values are body and header | body | LOW
+| camel.idempotency.expression.header | The header name that will be evaluated in case of camel.idempotency.expression.type equals to header | null | LOW
+| camel.idempotency.memory.dimension | The Memory dimension of the in memory idempotent Repository | 100 | LOW
+| camel.idempotency.kafka.topic | The Kafka topic name to use for the idempotent repository | kafka_idempotent_repository | LOW
+| camel.idempotency.kafka.bootstrap.servers | A comma-separated list of host and port pairs that are the addresses of the Kafka brokers where the idempotent repository should live | localhost:9092 | LOW
 |===
 
 For more options related to single connector you can have a look at xref:connectors.adoc[Connectors list].