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/19 10:07:31 UTC

[camel-kafka-connector] branch camel-master updated (5a52740 -> cf7c29c)

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 5a52740  Camel-Master: Fix catalog test
     new 84bb9d0  File language and core languages in general are not working
     new cf7c29c  Regen

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

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

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 84bb9d035a8048a9ae9fb8aff90573f7918ddc16
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 19 10:34:43 2020 +0100

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

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

[camel-kafka-connector] 02/02: 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 cf7c29c332c1c322c3ed1878bdf1eb22434711df
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 19 10:41:46 2020 +0100

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

diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json
index c372562..498bb23 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.overrideEndpoint": {
 			"name": "camel.sink.endpoint.overrideEndpoint",
 			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
@@ -184,13 +177,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -223,13 +209,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.autoDiscoverClient": {
-			"name": "camel.component.aws2-s3.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-s3.configuration": {
 			"name": "camel.component.aws2-s3.configuration",
 			"description": "The component configuration",
@@ -385,11 +364,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.basicPropertyBinding": {
-			"name": "camel.component.aws2-s3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-s3.autowiredEnabled": {
+			"name": "camel.component.aws2-s3.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-s3.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
index ce8dd68..b79d280 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.autoDiscoverClient": {
-			"name": "camel.source.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.overrideEndpoint": {
 			"name": "camel.source.endpoint.overrideEndpoint",
 			"description": "Set the need for overidding the endpoint. This option needs to be used in combination with uriEndpointOverride option",
@@ -235,13 +228,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -367,13 +353,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.autoDiscoverClient": {
-			"name": "camel.component.aws2-s3.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-s3.configuration": {
 			"name": "camel.component.aws2-s3.configuration",
 			"description": "The component configuration",
@@ -541,11 +520,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-s3.basicPropertyBinding": {
-			"name": "camel.component.aws2-s3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-s3.autowiredEnabled": {
+			"name": "camel.component.aws2-s3.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-s3.accessKey": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json
index 929c8c4..b0b6cef 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-sink.json
@@ -163,13 +163,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.channelGroup": {
 			"name": "camel.sink.endpoint.channelGroup",
 			"description": "To use a explicit ChannelGroup.",
@@ -512,11 +505,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.netty.basicPropertyBinding": {
-			"name": "camel.component.netty.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.netty.autowiredEnabled": {
+			"name": "camel.component.netty.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.netty.channelGroup": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-source.json
index 6984a7a..a8b8db6 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-netty-source.json
@@ -195,13 +195,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.channelGroup": {
 			"name": "camel.source.endpoint.channelGroup",
 			"description": "To use a explicit ChannelGroup.",
@@ -583,11 +576,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.netty.basicPropertyBinding": {
-			"name": "camel.component.netty.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.netty.autowiredEnabled": {
+			"name": "camel.component.netty.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.netty.channelGroup": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-workday-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-workday-sink.json
index 6929def..f2199c9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-workday-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-workday-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.httpConnectionManager": {
 			"name": "camel.sink.endpoint.httpConnectionManager",
 			"description": "Pool connection manager for advanced configuration.",
@@ -92,11 +85,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.workday.basicPropertyBinding": {
-			"name": "camel.component.workday.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.workday.autowiredEnabled": {
+			"name": "camel.component.workday.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xchange-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xchange-sink.json
index 0a42f54..54cd741 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xchange-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xchange-sink.json
@@ -46,13 +46,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -67,11 +60,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xchange.basicPropertyBinding": {
-			"name": "camel.component.xchange.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xchange.autowiredEnabled": {
+			"name": "camel.component.xchange.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xj-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xj-sink.json
index 489d52a..401db70 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xj-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xj-sink.json
@@ -70,13 +70,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.entityResolver": {
 			"name": "camel.sink.endpoint.entityResolver",
 			"description": "To use a custom org.xml.sax.EntityResolver with javax.xml.transform.sax.SAXSource.",
@@ -152,11 +145,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xj.basicPropertyBinding": {
-			"name": "camel.component.xj.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xj.autowiredEnabled": {
+			"name": "camel.component.xj.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xj.saxonConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-sign-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-sign-sink.json
index 41b424a..cf62490 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-sign-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-sign-sink.json
@@ -181,13 +181,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -367,11 +360,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xmlsecurity-sign.basicPropertyBinding": {
-			"name": "camel.component.xmlsecurity-sign.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xmlsecurity-sign.autowiredEnabled": {
+			"name": "camel.component.xmlsecurity-sign.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xmlsecurity-sign.signerConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-verify-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-verify-sink.json
index 6f00d9a..fb096a9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-verify-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmlsecurity-verify-sink.json
@@ -118,13 +118,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -241,11 +234,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xmlsecurity-verify.basicPropertyBinding": {
-			"name": "camel.component.xmlsecurity-verify.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xmlsecurity-verify.autowiredEnabled": {
+			"name": "camel.component.xmlsecurity-verify.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xmlsecurity-verify.uriDereferencer": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-sink.json
index 0764876..aaf02a1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-sink.json
@@ -87,13 +87,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.connectionConfig": {
 			"name": "camel.sink.endpoint.connectionConfig",
 			"description": "To use an existing connection configuration. Currently org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration is only supported (XMPP over TCP).",
@@ -138,11 +131,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xmpp.basicPropertyBinding": {
-			"name": "camel.component.xmpp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xmpp.autowiredEnabled": {
+			"name": "camel.component.xmpp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-source.json
index bfa1ae0..9ec64b8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xmpp-source.json
@@ -113,13 +113,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.connectionConfig": {
 			"name": "camel.source.endpoint.connectionConfig",
 			"description": "To use an existing connection configuration. Currently org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration is only supported (XMPP over TCP).",
@@ -164,11 +157,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xmpp.basicPropertyBinding": {
-			"name": "camel.component.xmpp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xmpp.autowiredEnabled": {
+			"name": "camel.component.xmpp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-sink.json
index 0ee662a..63aae3c 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-sink.json
@@ -61,13 +61,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.configuration": {
 			"name": "camel.sink.endpoint.configuration",
 			"description": "To use a custom Saxon configuration",
@@ -118,11 +111,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xquery.basicPropertyBinding": {
-			"name": "camel.component.xquery.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xquery.autowiredEnabled": {
+			"name": "camel.component.xquery.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xquery.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-source.json
index 7892d4f..550e6d1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xquery-source.json
@@ -86,13 +86,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.configuration": {
 			"name": "camel.source.endpoint.configuration",
 			"description": "To use a custom Saxon configuration",
@@ -236,11 +229,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xquery.basicPropertyBinding": {
-			"name": "camel.component.xquery.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xquery.autowiredEnabled": {
+			"name": "camel.component.xquery.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xquery.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-saxon-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-saxon-sink.json
index fac2381..c7971c1 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-saxon-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-saxon-sink.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.entityResolver": {
 			"name": "camel.sink.endpoint.entityResolver",
 			"description": "To use a custom org.xml.sax.EntityResolver with javax.xml.transform.sax.SAXSource.",
@@ -146,11 +139,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xslt-saxon.basicPropertyBinding": {
-			"name": "camel.component.xslt-saxon.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xslt-saxon.autowiredEnabled": {
+			"name": "camel.component.xslt-saxon.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xslt-saxon.saxonConfiguration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-sink.json
index b9bfd5c..b105bd9 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-xslt-sink.json
@@ -57,13 +57,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.entityResolver": {
 			"name": "camel.sink.endpoint.entityResolver",
 			"description": "To use a custom org.xml.sax.EntityResolver with javax.xml.transform.sax.SAXSource.",
@@ -127,11 +120,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.xslt.basicPropertyBinding": {
-			"name": "camel.component.xslt.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.xslt.autowiredEnabled": {
+			"name": "camel.component.xslt.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.xslt.transformerFactoryClass": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-sink.json
index a1b32e8..2d52ef5 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-sink.json
@@ -29,13 +29,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.requestor": {
 			"name": "camel.sink.endpoint.requestor",
 			"description": "To use a specific requester to communicate with Yammer.",
@@ -81,11 +74,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.yammer.basicPropertyBinding": {
-			"name": "camel.component.yammer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.yammer.autowiredEnabled": {
+			"name": "camel.component.yammer.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.yammer.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-source.json
index 6753b0e..b12d866 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-yammer-source.json
@@ -94,13 +94,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.requestor": {
 			"name": "camel.source.endpoint.requestor",
 			"description": "To use a specific requester to communicate with Yammer.",
@@ -272,11 +265,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.yammer.basicPropertyBinding": {
-			"name": "camel.component.yammer.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.yammer.autowiredEnabled": {
+			"name": "camel.component.yammer.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.yammer.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-sink.json
index 285847d..61005a4 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-sink.json
@@ -34,13 +34,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -85,11 +78,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.zendesk.basicPropertyBinding": {
-			"name": "camel.component.zendesk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.zendesk.autowiredEnabled": {
+			"name": "camel.component.zendesk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.zendesk.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-source.json
index fe37aad..e71b519 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zendesk-source.json
@@ -59,13 +59,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -203,11 +196,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.zendesk.basicPropertyBinding": {
-			"name": "camel.component.zendesk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.zendesk.autowiredEnabled": {
+			"name": "camel.component.zendesk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.zendesk.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-master-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-master-source.json
index 835ea55..7335195 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-master-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-master-source.json
@@ -40,13 +40,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -82,11 +75,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.zookeeper-master.basicPropertyBinding": {
-			"name": "camel.component.zookeeper-master.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.zookeeper-master.autowiredEnabled": {
+			"name": "camel.component.zookeeper-master.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.zookeeper-master.containerIdFactory": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-sink.json
index 1632f32..5cbb69f 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-sink.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-sink.json
@@ -56,13 +56,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -105,11 +98,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.zookeeper.basicPropertyBinding": {
-			"name": "camel.component.zookeeper.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.zookeeper.autowiredEnabled": {
+			"name": "camel.component.zookeeper.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.zookeeper.configuration": {
diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-source.json
index 4e8c18d..31288b8 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-source.json
+++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-zookeeper-source.json
@@ -75,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -131,11 +124,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.zookeeper.basicPropertyBinding": {
-			"name": "camel.component.zookeeper.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.zookeeper.autowiredEnabled": {
+			"name": "camel.component.zookeeper.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.zookeeper.configuration": {
diff --git a/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-sink.json b/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-sink.json
index 16ae0b7..384a98f 100644
--- a/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-sink.json
+++ b/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-sink.json
@@ -261,13 +261,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.destinationResolver": {
 			"name": "camel.sink.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -760,11 +753,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.activemq.basicPropertyBinding": {
-			"name": "camel.component.activemq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.activemq.autowiredEnabled": {
+			"name": "camel.component.activemq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.activemq.configuration": {
diff --git a/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-source.json b/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-source.json
index 239fd28..b4688db 100644
--- a/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-source.json
+++ b/connectors/camel-activemq-kafka-connector/src/generated/resources/camel-activemq-source.json
@@ -247,13 +247,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.destinationResolver": {
 			"name": "camel.source.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -734,11 +727,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.activemq.basicPropertyBinding": {
-			"name": "camel.component.activemq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.activemq.autowiredEnabled": {
+			"name": "camel.component.activemq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.activemq.configuration": {
diff --git a/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-sink-connector.adoc b/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-sink-connector.adoc
index 86fb62d..a10181e 100644
--- a/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-sink-connector.adoc
+++ b/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.activemq.CamelActivemqSinkConnec
 ----
 
 
-The camel-activemq sink connector supports 149 options, which are listed below.
+The camel-activemq sink connector supports 148 options, which are listed below.
 
 
 
@@ -67,7 +67,6 @@ The camel-activemq sink connector supports 149 options, which are listed below.
 | *camel.sink.endpoint.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.sink.endpoint.asyncStartListener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is  [...]
 | *camel.sink.endpoint.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.sink.endpoint.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom erro [...]
 | *camel.sink.endpoint.exceptionListener* | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. | null | false | MEDIUM
@@ -142,7 +141,7 @@ The camel-activemq sink connector supports 149 options, which are listed below.
 | *camel.component.activemq.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.component.activemq.asyncStartListener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this optio [...]
 | *camel.component.activemq.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.component.activemq.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.activemq.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.activemq.configuration* | To use a shared JMS configuration | null | false | MEDIUM
 | *camel.component.activemq.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.component.activemq.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom [...]
diff --git a/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-source-connector.adoc b/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-source-connector.adoc
index f814eca..431cccb 100644
--- a/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-source-connector.adoc
+++ b/connectors/camel-activemq-kafka-connector/src/main/docs/camel-activemq-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.activemq.CamelActivemqSourceConn
 ----
 
 
-The camel-activemq source connector supports 147 options, which are listed below.
+The camel-activemq source connector supports 146 options, which are listed below.
 
 
 
@@ -65,7 +65,6 @@ The camel-activemq source connector supports 147 options, which are listed below
 | *camel.source.endpoint.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.source.endpoint.asyncStartListener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option i [...]
 | *camel.source.endpoint.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.source.endpoint.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom er [...]
 | *camel.source.endpoint.exceptionListener* | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. | null | false | MEDIUM
@@ -138,7 +137,7 @@ The camel-activemq source connector supports 147 options, which are listed below
 | *camel.component.activemq.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.component.activemq.asyncStartListener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this optio [...]
 | *camel.component.activemq.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.component.activemq.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.activemq.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.activemq.configuration* | To use a shared JMS configuration | null | false | MEDIUM
 | *camel.component.activemq.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.component.activemq.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom [...]
diff --git a/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSinkConnectorConfig.java b/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSinkConnectorConfig.java
index 35c6d80..696dd6c 100644
--- a/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSinkConnectorConfig.java
+++ b/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSinkConnectorConfig.java
@@ -140,9 +140,6 @@ public class CamelActivemqSinkConnectorConfig
     public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_CONF = "camel.sink.endpoint.asyncStopListener";
     public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_CONF = "camel.sink.endpoint.destinationResolver";
     public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DOC = "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).";
     public static final String CAMEL_SINK_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DEFAULT = null;
@@ -365,9 +362,9 @@ public class CamelActivemqSinkConnectorConfig
     public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_CONF = "camel.component.activemq.asyncStopListener";
     public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.activemq.basicPropertyBinding";
-    public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.activemq.autowiredEnabled";
+    public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_CONFIGURATION_CONF = "camel.component.activemq.configuration";
     public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_CONFIGURATION_DOC = "To use a shared JMS configuration";
     public static final String CAMEL_SINK_ACTIVEMQ_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -524,7 +521,6 @@ public class CamelActivemqSinkConnectorConfig
         conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_ENDPOINT_EXCEPTION_LISTENER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ACTIVEMQ_ENDPOINT_EXCEPTION_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_ENDPOINT_EXCEPTION_LISTENER_DOC);
@@ -599,7 +595,7 @@ public class CamelActivemqSinkConnectorConfig
         conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_COMPONENT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ACTIVEMQ_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ACTIVEMQ_COMPONENT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SINK_ACTIVEMQ_COMPONENT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ACTIVEMQ_COMPONENT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ACTIVEMQ_COMPONENT_ERROR_HANDLER_DOC);
diff --git a/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSourceConnectorConfig.java b/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSourceConnectorConfig.java
index d1422bc..8714894 100644
--- a/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSourceConnectorConfig.java
+++ b/connectors/camel-activemq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/activemq/CamelActivemqSourceConnectorConfig.java
@@ -134,9 +134,6 @@ public class CamelActivemqSourceConnectorConfig
     public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_CONF = "camel.source.endpoint.asyncStopListener";
     public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_CONF = "camel.source.endpoint.destinationResolver";
     public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DOC = "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).";
     public static final String CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DEFAULT = null;
@@ -353,9 +350,9 @@ public class CamelActivemqSourceConnectorConfig
     public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_CONF = "camel.component.activemq.asyncStopListener";
     public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.activemq.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.activemq.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_CONFIGURATION_CONF = "camel.component.activemq.configuration";
     public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_CONFIGURATION_DOC = "To use a shared JMS configuration";
     public static final String CAMEL_SOURCE_ACTIVEMQ_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -516,7 +513,6 @@ public class CamelActivemqSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_EXCEPTION_LISTENER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_EXCEPTION_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_ENDPOINT_EXCEPTION_LISTENER_DOC);
@@ -589,7 +585,7 @@ public class CamelActivemqSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ACTIVEMQ_COMPONENT_ERROR_HANDLER_DOC);
diff --git a/connectors/camel-ahc-kafka-connector/src/generated/resources/camel-ahc-sink.json b/connectors/camel-ahc-kafka-connector/src/generated/resources/camel-ahc-sink.json
index e895fc2..7390159 100644
--- a/connectors/camel-ahc-kafka-connector/src/generated/resources/camel-ahc-sink.json
+++ b/connectors/camel-ahc-kafka-connector/src/generated/resources/camel-ahc-sink.json
@@ -69,13 +69,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -127,11 +120,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc.basicPropertyBinding": {
-			"name": "camel.component.ahc.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc.autowiredEnabled": {
+			"name": "camel.component.ahc.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc.binding": {
diff --git a/connectors/camel-ahc-kafka-connector/src/main/docs/camel-ahc-kafka-sink-connector.adoc b/connectors/camel-ahc-kafka-connector/src/main/docs/camel-ahc-kafka-sink-connector.adoc
index 02848cc..9c0c757 100644
--- a/connectors/camel-ahc-kafka-connector/src/main/docs/camel-ahc-kafka-sink-connector.adoc
+++ b/connectors/camel-ahc-kafka-connector/src/main/docs/camel-ahc-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.ahc.CamelAhcSinkConnector
 ----
 
 
-The camel-ahc sink connector supports 25 options, which are listed below.
+The camel-ahc sink connector supports 24 options, which are listed below.
 
 
 
@@ -38,7 +38,6 @@ The camel-ahc sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.throwExceptionOnFailure* | Option to disable throwing the AhcOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. | true | false | MEDIUM
 | *camel.sink.endpoint.transferException* | If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type (for example using Jetty or Servlet Camel components). On the producer side the exception will be deserialized and thrown as is, instead of the AhcOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConfigOptions* | To configure the AsyncHttpClientConfig using the key/values from the Map. | null | false | MEDIUM
@@ -47,7 +46,7 @@ The camel-ahc sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.sslContextParameters* | Reference to a org.apache.camel.support.jsse.SSLContextParameters in the Registry. This reference overrides any configured SSLContextParameters at the component level. See Using the JSSE Configuration Utility. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | null | false | MEDIUM
 | *camel.component.ahc.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.component.ahc.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.ahc.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.ahc.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.ahc.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.component.ahc.client* | To use a custom AsyncHttpClient | null | false | MEDIUM
 | *camel.component.ahc.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
diff --git a/connectors/camel-ahc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahc/CamelAhcSinkConnectorConfig.java b/connectors/camel-ahc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahc/CamelAhcSinkConnectorConfig.java
index ab6bdea..f765641 100644
--- a/connectors/camel-ahc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahc/CamelAhcSinkConnectorConfig.java
+++ b/connectors/camel-ahc-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahc/CamelAhcSinkConnectorConfig.java
@@ -51,9 +51,6 @@ public class CamelAhcSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AHC_ENDPOINT_TRANSFER_EXCEPTION_CONF = "camel.sink.endpoint.transferException";
     public static final String CAMEL_SINK_AHC_ENDPOINT_TRANSFER_EXCEPTION_DOC = "If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type (for example using Jetty or Servlet Camel components). On the producer side the exception will be deserialized and thrown as is, instead of the AhcOperationFailedException. The caused exception is required to be serializ [...]
     public static final Boolean CAMEL_SINK_AHC_ENDPOINT_TRANSFER_EXCEPTION_DEFAULT = false;
-    public static final String CAMEL_SINK_AHC_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AHC_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AHC_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AHC_ENDPOINT_BINDING_CONF = "camel.sink.endpoint.binding";
     public static final String CAMEL_SINK_AHC_ENDPOINT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SINK_AHC_ENDPOINT_BINDING_DEFAULT = null;
@@ -78,9 +75,9 @@ public class CamelAhcSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AHC_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.ahc.allowJavaSerializedObject";
     public static final String CAMEL_SINK_AHC_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SINK_AHC_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SINK_AHC_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.ahc.basicPropertyBinding";
-    public static final String CAMEL_SINK_AHC_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AHC_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AHC_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.ahc.autowiredEnabled";
+    public static final String CAMEL_SINK_AHC_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AHC_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AHC_COMPONENT_BINDING_CONF = "camel.component.ahc.binding";
     public static final String CAMEL_SINK_AHC_COMPONENT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SINK_AHC_COMPONENT_BINDING_DEFAULT = null;
@@ -121,7 +118,6 @@ public class CamelAhcSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AHC_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AHC_ENDPOINT_THROW_EXCEPTION_ON_FAILURE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_ENDPOINT_THROW_EXCEPTION_ON_FAILURE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_THROW_EXCEPTION_ON_FAILURE_DOC);
         conf.define(CAMEL_SINK_AHC_ENDPOINT_TRANSFER_EXCEPTION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_ENDPOINT_TRANSFER_EXCEPTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_TRANSFER_EXCEPTION_DOC);
-        conf.define(CAMEL_SINK_AHC_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AHC_ENDPOINT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_ENDPOINT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_BINDING_DOC);
         conf.define(CAMEL_SINK_AHC_ENDPOINT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_ENDPOINT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_CLIENT_CONFIG_DOC);
         conf.define(CAMEL_SINK_AHC_ENDPOINT_CLIENT_CONFIG_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_ENDPOINT_CLIENT_CONFIG_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_CLIENT_CONFIG_OPTIONS_DOC);
@@ -130,7 +126,7 @@ public class CamelAhcSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AHC_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AHC_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AHC_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SINK_AHC_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AHC_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AHC_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHC_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AHC_COMPONENT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_COMPONENT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_COMPONENT_BINDING_DOC);
         conf.define(CAMEL_SINK_AHC_COMPONENT_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_COMPONENT_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_COMPONENT_CLIENT_DOC);
         conf.define(CAMEL_SINK_AHC_COMPONENT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHC_COMPONENT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHC_COMPONENT_CLIENT_CONFIG_DOC);
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-sink.json b/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-sink.json
index 34731ca..ef5573c 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-sink.json
+++ b/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-sink.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -134,11 +127,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-ws.basicPropertyBinding": {
-			"name": "camel.component.ahc-ws.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-ws.autowiredEnabled": {
+			"name": "camel.component.ahc-ws.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-ws.binding": {
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-source.json b/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-source.json
index 3ae9a95..b68bf77 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-source.json
+++ b/connectors/camel-ahc-ws-kafka-connector/src/generated/resources/camel-ahc-ws-source.json
@@ -75,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -133,11 +126,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-ws.basicPropertyBinding": {
-			"name": "camel.component.ahc-ws.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-ws.autowiredEnabled": {
+			"name": "camel.component.ahc-ws.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-ws.binding": {
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-sink-connector.adoc b/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-sink-connector.adoc
index acc6523..cdfa57a 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-sink-connector.adoc
+++ b/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.ahcws.CamelAhcwsSinkConnector
 ----
 
 
-The camel-ahc-ws sink connector supports 26 options, which are listed below.
+The camel-ahc-ws sink connector supports 25 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-ahc-ws sink connector supports 26 options, which are listed below.
 | *camel.sink.endpoint.cookieHandler* | Configure a cookie handler to maintain a HTTP session | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.useStreaming* | To enable streaming to send data as multiple text fragments. | false | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConfigOptions* | To configure the AsyncHttpClientConfig using the key/values from the Map. | null | false | MEDIUM
@@ -48,7 +47,7 @@ The camel-ahc-ws sink connector supports 26 options, which are listed below.
 | *camel.sink.endpoint.sslContextParameters* | Reference to a org.apache.camel.support.jsse.SSLContextParameters in the Registry. This reference overrides any configured SSLContextParameters at the component level. See Using the JSSE Configuration Utility. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | null | false | MEDIUM
 | *camel.component.ahc-ws.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then  [...]
 | *camel.component.ahc-ws.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.ahc-ws.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.ahc-ws.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.ahc-ws.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.component.ahc-ws.client* | To use a custom AsyncHttpClient | null | false | MEDIUM
 | *camel.component.ahc-ws.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-source-connector.adoc b/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-source-connector.adoc
index 959ec97..8421cb8 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-source-connector.adoc
+++ b/connectors/camel-ahc-ws-kafka-connector/src/main/docs/camel-ahc-ws-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.ahcws.CamelAhcwsSourceConnector
 ----
 
 
-The camel-ahc-ws source connector supports 26 options, which are listed below.
+The camel-ahc-ws source connector supports 25 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-ahc-ws source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.sendMessageOnError* | Whether to send an message if the web-socket listener received an error. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.source.endpoint.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
 | *camel.source.endpoint.clientConfigOptions* | To configure the AsyncHttpClientConfig using the key/values from the Map. | null | false | MEDIUM
@@ -48,7 +47,7 @@ The camel-ahc-ws source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.sslContextParameters* | Reference to a org.apache.camel.support.jsse.SSLContextParameters in the Registry. This reference overrides any configured SSLContextParameters at the component level. See Using the JSSE Configuration Utility. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | null | false | MEDIUM
 | *camel.component.ahc-ws.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.component.ahc-ws.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.ahc-ws.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.ahc-ws.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.ahc-ws.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.component.ahc-ws.client* | To use a custom AsyncHttpClient | null | false | MEDIUM
 | *camel.component.ahc-ws.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSinkConnectorConfig.java b/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSinkConnectorConfig.java
index a293964..f939e0a 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSinkConnectorConfig.java
+++ b/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSinkConnectorConfig.java
@@ -54,9 +54,6 @@ public class CamelAhcwsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AHCWS_ENDPOINT_USE_STREAMING_CONF = "camel.sink.endpoint.useStreaming";
     public static final String CAMEL_SINK_AHCWS_ENDPOINT_USE_STREAMING_DOC = "To enable streaming to send data as multiple text fragments.";
     public static final Boolean CAMEL_SINK_AHCWS_ENDPOINT_USE_STREAMING_DEFAULT = false;
-    public static final String CAMEL_SINK_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AHCWS_ENDPOINT_BINDING_CONF = "camel.sink.endpoint.binding";
     public static final String CAMEL_SINK_AHCWS_ENDPOINT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SINK_AHCWS_ENDPOINT_BINDING_DEFAULT = null;
@@ -81,9 +78,9 @@ public class CamelAhcwsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.ahc-ws.allowJavaSerializedObject";
     public static final String CAMEL_SINK_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SINK_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SINK_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.ahc-ws.basicPropertyBinding";
-    public static final String CAMEL_SINK_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AHCWS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.ahc-ws.autowiredEnabled";
+    public static final String CAMEL_SINK_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AHCWS_COMPONENT_BINDING_CONF = "camel.component.ahc-ws.binding";
     public static final String CAMEL_SINK_AHCWS_COMPONENT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SINK_AHCWS_COMPONENT_BINDING_DEFAULT = null;
@@ -125,7 +122,6 @@ public class CamelAhcwsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_COOKIE_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_ENDPOINT_COOKIE_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_COOKIE_HANDLER_DOC);
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_USE_STREAMING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_ENDPOINT_USE_STREAMING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_USE_STREAMING_DOC);
-        conf.define(CAMEL_SINK_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_ENDPOINT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_BINDING_DOC);
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_ENDPOINT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_CLIENT_CONFIG_DOC);
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_CLIENT_CONFIG_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DOC);
@@ -134,7 +130,7 @@ public class CamelAhcwsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AHCWS_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AHCWS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SINK_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AHCWS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AHCWS_COMPONENT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_COMPONENT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_COMPONENT_BINDING_DOC);
         conf.define(CAMEL_SINK_AHCWS_COMPONENT_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_COMPONENT_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_COMPONENT_CLIENT_DOC);
         conf.define(CAMEL_SINK_AHCWS_COMPONENT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWS_COMPONENT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWS_COMPONENT_CLIENT_CONFIG_DOC);
diff --git a/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSourceConnectorConfig.java b/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSourceConnectorConfig.java
index a69899e..c99fb67 100644
--- a/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSourceConnectorConfig.java
+++ b/connectors/camel-ahc-ws-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcws/CamelAhcwsSourceConnectorConfig.java
@@ -56,9 +56,6 @@ public class CamelAhcwsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_BINDING_CONF = "camel.source.endpoint.binding";
     public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SOURCE_AHCWS_ENDPOINT_BINDING_DEFAULT = null;
@@ -83,9 +80,9 @@ public class CamelAhcwsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.ahc-ws.allowJavaSerializedObject";
     public static final String CAMEL_SOURCE_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SOURCE_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.ahc-ws.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AHCWS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.ahc-ws.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AHCWS_COMPONENT_BINDING_CONF = "camel.component.ahc-ws.binding";
     public static final String CAMEL_SOURCE_AHCWS_COMPONENT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SOURCE_AHCWS_COMPONENT_BINDING_DEFAULT = null;
@@ -127,7 +124,6 @@ public class CamelAhcwsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_SEND_MESSAGE_ON_ERROR_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWS_ENDPOINT_SEND_MESSAGE_ON_ERROR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_SEND_MESSAGE_ON_ERROR_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_ENDPOINT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_ENDPOINT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_CLIENT_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_CLIENT_CONFIG_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DOC);
@@ -136,7 +132,7 @@ public class CamelAhcwsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AHCWS_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AHCWS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_COMPONENT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_COMPONENT_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_COMPONENT_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_COMPONENT_CLIENT_DOC);
         conf.define(CAMEL_SOURCE_AHCWS_COMPONENT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWS_COMPONENT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWS_COMPONENT_CLIENT_CONFIG_DOC);
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-sink.json b/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-sink.json
index 63cbb60..e4fea62 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-sink.json
+++ b/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-sink.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.binding": {
 			"name": "camel.sink.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -134,11 +127,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-wss.basicPropertyBinding": {
-			"name": "camel.component.ahc-wss.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-wss.autowiredEnabled": {
+			"name": "camel.component.ahc-wss.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-wss.binding": {
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-source.json b/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-source.json
index 40c1d8a..270adac 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-source.json
+++ b/connectors/camel-ahc-wss-kafka-connector/src/generated/resources/camel-ahc-wss-source.json
@@ -75,13 +75,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.binding": {
 			"name": "camel.source.endpoint.binding",
 			"description": "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
@@ -133,11 +126,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.ahc-wss.basicPropertyBinding": {
-			"name": "camel.component.ahc-wss.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.ahc-wss.autowiredEnabled": {
+			"name": "camel.component.ahc-wss.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.ahc-wss.binding": {
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-sink-connector.adoc b/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-sink-connector.adoc
index d8f0ec2..665ec64 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-sink-connector.adoc
+++ b/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.ahcwss.CamelAhcwssSinkConnector
 ----
 
 
-The camel-ahc-wss sink connector supports 26 options, which are listed below.
+The camel-ahc-wss sink connector supports 25 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-ahc-wss sink connector supports 26 options, which are listed below.
 | *camel.sink.endpoint.cookieHandler* | Configure a cookie handler to maintain a HTTP session | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.useStreaming* | To enable streaming to send data as multiple text fragments. | false | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
 | *camel.sink.endpoint.clientConfigOptions* | To configure the AsyncHttpClientConfig using the key/values from the Map. | null | false | MEDIUM
@@ -48,7 +47,7 @@ The camel-ahc-wss sink connector supports 26 options, which are listed below.
 | *camel.sink.endpoint.sslContextParameters* | Reference to a org.apache.camel.support.jsse.SSLContextParameters in the Registry. This reference overrides any configured SSLContextParameters at the component level. See Using the JSSE Configuration Utility. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | null | false | MEDIUM
 | *camel.component.ahc-wss.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...]
 | *camel.component.ahc-wss.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.ahc-wss.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.ahc-wss.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.ahc-wss.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.component.ahc-wss.client* | To use a custom AsyncHttpClient | null | false | MEDIUM
 | *camel.component.ahc-wss.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-source-connector.adoc b/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-source-connector.adoc
index 34d52b5..47fb885 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-source-connector.adoc
+++ b/connectors/camel-ahc-wss-kafka-connector/src/main/docs/camel-ahc-wss-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.ahcwss.CamelAhcwssSourceConnecto
 ----
 
 
-The camel-ahc-wss source connector supports 26 options, which are listed below.
+The camel-ahc-wss source connector supports 25 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-ahc-wss source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.sendMessageOnError* | Whether to send an message if the web-socket listener received an error. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.source.endpoint.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
 | *camel.source.endpoint.clientConfigOptions* | To configure the AsyncHttpClientConfig using the key/values from the Map. | null | false | MEDIUM
@@ -48,7 +47,7 @@ The camel-ahc-wss source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.sslContextParameters* | Reference to a org.apache.camel.support.jsse.SSLContextParameters in the Registry. This reference overrides any configured SSLContextParameters at the component level. See Using the JSSE Configuration Utility. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | null | false | MEDIUM
 | *camel.component.ahc-wss.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.component.ahc-wss.allowJavaSerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.ahc-wss.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.ahc-wss.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.ahc-wss.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. | null | false | MEDIUM
 | *camel.component.ahc-wss.client* | To use a custom AsyncHttpClient | null | false | MEDIUM
 | *camel.component.ahc-wss.clientConfig* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | null | false | MEDIUM
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSinkConnectorConfig.java b/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSinkConnectorConfig.java
index 54d7982..f934128 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSinkConnectorConfig.java
+++ b/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSinkConnectorConfig.java
@@ -54,9 +54,6 @@ public class CamelAhcwssSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AHCWSS_ENDPOINT_USE_STREAMING_CONF = "camel.sink.endpoint.useStreaming";
     public static final String CAMEL_SINK_AHCWSS_ENDPOINT_USE_STREAMING_DOC = "To enable streaming to send data as multiple text fragments.";
     public static final Boolean CAMEL_SINK_AHCWSS_ENDPOINT_USE_STREAMING_DEFAULT = false;
-    public static final String CAMEL_SINK_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AHCWSS_ENDPOINT_BINDING_CONF = "camel.sink.endpoint.binding";
     public static final String CAMEL_SINK_AHCWSS_ENDPOINT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SINK_AHCWSS_ENDPOINT_BINDING_DEFAULT = null;
@@ -81,9 +78,9 @@ public class CamelAhcwssSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.ahc-wss.allowJavaSerializedObject";
     public static final String CAMEL_SINK_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SINK_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SINK_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.ahc-wss.basicPropertyBinding";
-    public static final String CAMEL_SINK_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.ahc-wss.autowiredEnabled";
+    public static final String CAMEL_SINK_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AHCWSS_COMPONENT_BINDING_CONF = "camel.component.ahc-wss.binding";
     public static final String CAMEL_SINK_AHCWSS_COMPONENT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SINK_AHCWSS_COMPONENT_BINDING_DEFAULT = null;
@@ -125,7 +122,6 @@ public class CamelAhcwssSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_COOKIE_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_ENDPOINT_COOKIE_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_COOKIE_HANDLER_DOC);
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_USE_STREAMING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_ENDPOINT_USE_STREAMING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_USE_STREAMING_DOC);
-        conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_ENDPOINT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_BINDING_DOC);
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_ENDPOINT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_CLIENT_CONFIG_DOC);
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_CLIENT_CONFIG_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DOC);
@@ -134,7 +130,7 @@ public class CamelAhcwssSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AHCWSS_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AHCWSS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SINK_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AHCWSS_COMPONENT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_COMPONENT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_COMPONENT_BINDING_DOC);
         conf.define(CAMEL_SINK_AHCWSS_COMPONENT_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_COMPONENT_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_COMPONENT_CLIENT_DOC);
         conf.define(CAMEL_SINK_AHCWSS_COMPONENT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AHCWSS_COMPONENT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AHCWSS_COMPONENT_CLIENT_CONFIG_DOC);
diff --git a/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSourceConnectorConfig.java b/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSourceConnectorConfig.java
index a6dc34b..6d3971c 100644
--- a/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSourceConnectorConfig.java
+++ b/connectors/camel-ahc-wss-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ahcwss/CamelAhcwssSourceConnectorConfig.java
@@ -56,9 +56,6 @@ public class CamelAhcwssSourceConnectorConfig
     public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_BINDING_CONF = "camel.source.endpoint.binding";
     public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SOURCE_AHCWSS_ENDPOINT_BINDING_DEFAULT = null;
@@ -83,9 +80,9 @@ public class CamelAhcwssSourceConnectorConfig
     public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.ahc-wss.allowJavaSerializedObject";
     public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SOURCE_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.ahc-wss.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.ahc-wss.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_BINDING_CONF = "camel.component.ahc-wss.binding";
     public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_BINDING_DOC = "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.";
     public static final String CAMEL_SOURCE_AHCWSS_COMPONENT_BINDING_DEFAULT = null;
@@ -127,7 +124,6 @@ public class CamelAhcwssSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_SEND_MESSAGE_ON_ERROR_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWSS_ENDPOINT_SEND_MESSAGE_ON_ERROR_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_SEND_MESSAGE_ON_ERROR_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_ENDPOINT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_ENDPOINT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_CLIENT_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_CLIENT_CONFIG_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_CLIENT_CONFIG_OPTIONS_DOC);
@@ -136,7 +132,7 @@ public class CamelAhcwssSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AHCWSS_ENDPOINT_SSL_CONTEXT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_ENDPOINT_SSL_CONTEXT_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWSS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AHCWSS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_COMPONENT_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_COMPONENT_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_COMPONENT_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_COMPONENT_CLIENT_DOC);
         conf.define(CAMEL_SOURCE_AHCWSS_COMPONENT_CLIENT_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AHCWSS_COMPONENT_CLIENT_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AHCWSS_COMPONENT_CLIENT_CONFIG_DOC);
diff --git a/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-sink.json b/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-sink.json
index d49cf73..a72d743 100644
--- a/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-sink.json
+++ b/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-sink.json
@@ -261,13 +261,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.destinationResolver": {
 			"name": "camel.sink.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -747,11 +740,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.amqp.basicPropertyBinding": {
-			"name": "camel.component.amqp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.amqp.autowiredEnabled": {
+			"name": "camel.component.amqp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.amqp.configuration": {
diff --git a/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-source.json b/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-source.json
index cc16650..c3feb3a 100644
--- a/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-source.json
+++ b/connectors/camel-amqp-kafka-connector/src/generated/resources/camel-amqp-source.json
@@ -247,13 +247,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.destinationResolver": {
 			"name": "camel.source.endpoint.destinationResolver",
 			"description": "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).",
@@ -721,11 +714,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.amqp.basicPropertyBinding": {
-			"name": "camel.component.amqp.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.amqp.autowiredEnabled": {
+			"name": "camel.component.amqp.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.amqp.configuration": {
diff --git a/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-sink-connector.adoc b/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-sink-connector.adoc
index 69ff088..a54fe3d 100644
--- a/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-sink-connector.adoc
+++ b/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.amqp.CamelAmqpSinkConnector
 ----
 
 
-The camel-amqp sink connector supports 146 options, which are listed below.
+The camel-amqp sink connector supports 145 options, which are listed below.
 
 
 
@@ -67,7 +67,6 @@ The camel-amqp sink connector supports 146 options, which are listed below.
 | *camel.sink.endpoint.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.sink.endpoint.asyncStartListener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is  [...]
 | *camel.sink.endpoint.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.sink.endpoint.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom erro [...]
 | *camel.sink.endpoint.exceptionListener* | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. | null | false | MEDIUM
@@ -140,7 +139,7 @@ The camel-amqp sink connector supports 146 options, which are listed below.
 | *camel.component.amqp.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.component.amqp.asyncStartListener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is [...]
 | *camel.component.amqp.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.component.amqp.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.amqp.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.amqp.configuration* | To use a shared JMS configuration | null | false | MEDIUM
 | *camel.component.amqp.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.component.amqp.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom err [...]
diff --git a/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-source-connector.adoc b/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-source-connector.adoc
index c672f9e..1aab7b8 100644
--- a/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-source-connector.adoc
+++ b/connectors/camel-amqp-kafka-connector/src/main/docs/camel-amqp-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.amqp.CamelAmqpSourceConnector
 ----
 
 
-The camel-amqp source connector supports 144 options, which are listed below.
+The camel-amqp source connector supports 143 options, which are listed below.
 
 
 
@@ -65,7 +65,6 @@ The camel-amqp source connector supports 144 options, which are listed below.
 | *camel.source.endpoint.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.source.endpoint.asyncStartListener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option i [...]
 | *camel.source.endpoint.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.source.endpoint.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom er [...]
 | *camel.source.endpoint.exceptionListener* | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. | null | false | MEDIUM
@@ -136,7 +135,7 @@ The camel-amqp source connector supports 144 options, which are listed below.
 | *camel.component.amqp.artemisStreamingEnabled* | Whether optimizing for Apache Artemis streaming mode. | true | false | MEDIUM
 | *camel.component.amqp.asyncStartListener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is [...]
 | *camel.component.amqp.asyncStopListener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | false | MEDIUM
-| *camel.component.amqp.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.amqp.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.amqp.configuration* | To use a shared JMS configuration | null | false | MEDIUM
 | *camel.component.amqp.destinationResolver* | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | null | false | MEDIUM
 | *camel.component.amqp.errorHandler* | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom err [...]
diff --git a/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSinkConnectorConfig.java b/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSinkConnectorConfig.java
index f8892ef..e0056e0 100644
--- a/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSinkConnectorConfig.java
+++ b/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSinkConnectorConfig.java
@@ -138,9 +138,6 @@ public class CamelAmqpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_CONF = "camel.sink.endpoint.asyncStopListener";
     public static final String CAMEL_SINK_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SINK_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SINK_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AMQP_ENDPOINT_DESTINATION_RESOLVER_CONF = "camel.sink.endpoint.destinationResolver";
     public static final String CAMEL_SINK_AMQP_ENDPOINT_DESTINATION_RESOLVER_DOC = "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).";
     public static final String CAMEL_SINK_AMQP_ENDPOINT_DESTINATION_RESOLVER_DEFAULT = null;
@@ -357,9 +354,9 @@ public class CamelAmqpSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AMQP_COMPONENT_ASYNC_STOP_LISTENER_CONF = "camel.component.amqp.asyncStopListener";
     public static final String CAMEL_SINK_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SINK_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SINK_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.amqp.basicPropertyBinding";
-    public static final String CAMEL_SINK_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AMQP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.amqp.autowiredEnabled";
+    public static final String CAMEL_SINK_AMQP_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AMQP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AMQP_COMPONENT_CONFIGURATION_CONF = "camel.component.amqp.configuration";
     public static final String CAMEL_SINK_AMQP_COMPONENT_CONFIGURATION_DOC = "To use a shared JMS configuration";
     public static final String CAMEL_SINK_AMQP_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -513,7 +510,6 @@ public class CamelAmqpSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AMQP_ENDPOINT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SINK_AMQP_ENDPOINT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_ENDPOINT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SINK_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SINK_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AMQP_ENDPOINT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AMQP_ENDPOINT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SINK_AMQP_ENDPOINT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AMQP_ENDPOINT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SINK_AMQP_ENDPOINT_EXCEPTION_LISTENER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AMQP_ENDPOINT_EXCEPTION_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_ENDPOINT_EXCEPTION_LISTENER_DOC);
@@ -586,7 +582,7 @@ public class CamelAmqpSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AMQP_COMPONENT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_COMPONENT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SINK_AMQP_COMPONENT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_COMPONENT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SINK_AMQP_COMPONENT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SINK_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AMQP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AMQP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AMQP_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AMQP_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AMQP_COMPONENT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AMQP_COMPONENT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SINK_AMQP_COMPONENT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AMQP_COMPONENT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AMQP_COMPONENT_ERROR_HANDLER_DOC);
diff --git a/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSourceConnectorConfig.java b/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSourceConnectorConfig.java
index 1765cba..0e39f97 100644
--- a/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSourceConnectorConfig.java
+++ b/connectors/camel-amqp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/amqp/CamelAmqpSourceConnectorConfig.java
@@ -134,9 +134,6 @@ public class CamelAmqpSourceConnectorConfig
     public static final String CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_CONF = "camel.source.endpoint.asyncStopListener";
     public static final String CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AMQP_ENDPOINT_DESTINATION_RESOLVER_CONF = "camel.source.endpoint.destinationResolver";
     public static final String CAMEL_SOURCE_AMQP_ENDPOINT_DESTINATION_RESOLVER_DOC = "A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry).";
     public static final String CAMEL_SOURCE_AMQP_ENDPOINT_DESTINATION_RESOLVER_DEFAULT = null;
@@ -347,9 +344,9 @@ public class CamelAmqpSourceConnectorConfig
     public static final String CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_STOP_LISTENER_CONF = "camel.component.amqp.asyncStopListener";
     public static final String CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DOC = "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route.";
     public static final Boolean CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.amqp.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AMQP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.amqp.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AMQP_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AMQP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AMQP_COMPONENT_CONFIGURATION_CONF = "camel.component.amqp.configuration";
     public static final String CAMEL_SOURCE_AMQP_COMPONENT_CONFIGURATION_DOC = "To use a shared JMS configuration";
     public static final String CAMEL_SOURCE_AMQP_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -507,7 +504,6 @@ public class CamelAmqpSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AMQP_ENDPOINT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AMQP_ENDPOINT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AMQP_ENDPOINT_EXCEPTION_LISTENER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AMQP_ENDPOINT_EXCEPTION_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_ENDPOINT_EXCEPTION_LISTENER_DOC);
@@ -578,7 +574,7 @@ public class CamelAmqpSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AMQP_COMPONENT_ARTEMIS_STREAMING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_COMPONENT_ARTEMIS_STREAMING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_ARTEMIS_STREAMING_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_START_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_START_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_START_LISTENER_DOC);
         conf.define(CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_STOP_LISTENER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_ASYNC_STOP_LISTENER_DOC);
-        conf.define(CAMEL_SOURCE_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AMQP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AMQP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AMQP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AMQP_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AMQP_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SOURCE_AMQP_COMPONENT_DESTINATION_RESOLVER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AMQP_COMPONENT_DESTINATION_RESOLVER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_DESTINATION_RESOLVER_DOC);
         conf.define(CAMEL_SOURCE_AMQP_COMPONENT_ERROR_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AMQP_COMPONENT_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AMQP_COMPONENT_ERROR_HANDLER_DOC);
diff --git a/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-sink.json b/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-sink.json
index 2ebea02..ec84d66 100644
--- a/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-sink.json
+++ b/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-sink.json
@@ -28,13 +28,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -55,11 +48,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.apns.basicPropertyBinding": {
-			"name": "camel.component.apns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.apns.autowiredEnabled": {
+			"name": "camel.component.apns.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-source.json b/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-source.json
index 8e59414..d8e7156 100644
--- a/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-source.json
+++ b/connectors/camel-apns-kafka-connector/src/generated/resources/camel-apns-source.json
@@ -53,13 +53,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -173,11 +166,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.apns.basicPropertyBinding": {
-			"name": "camel.component.apns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.apns.autowiredEnabled": {
+			"name": "camel.component.apns.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-sink-connector.adoc b/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-sink-connector.adoc
index 38a3d80..727bc82 100644
--- a/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-sink-connector.adoc
+++ b/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.apns.CamelApnsSinkConnector
 ----
 
 
-The camel-apns sink connector supports 8 options, which are listed below.
+The camel-apns sink connector supports 7 options, which are listed below.
 
 
 
@@ -32,11 +32,10 @@ The camel-apns sink connector supports 8 options, which are listed below.
 | *camel.sink.path.name* | Name of the endpoint | null | false | MEDIUM
 | *camel.sink.endpoint.tokens* | Configure this property in case you want to statically declare tokens related to devices you want to notify. Tokens are separated by comma. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.apns.apnsService* | The ApnsService to use. The org.apache.camel.component.apns.factory.ApnsServiceFactory can be used to build a ApnsService | null | true | HIGH
 | *camel.component.apns.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cr [...]
-| *camel.component.apns.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.apns.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-source-connector.adoc b/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-source-connector.adoc
index 22f14fa..6541637 100644
--- a/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-source-connector.adoc
+++ b/connectors/camel-apns-kafka-connector/src/main/docs/camel-apns-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.apns.CamelApnsSourceConnector
 ----
 
 
-The camel-apns source connector supports 26 options, which are listed below.
+The camel-apns source connector supports 25 options, which are listed below.
 
 
 
@@ -36,7 +36,6 @@ The camel-apns source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.backoffErrorThreshold* | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
 | *camel.source.endpoint.backoffIdleThreshold* | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
@@ -54,7 +53,7 @@ The camel-apns source connector supports 26 options, which are listed below.
 | *camel.source.endpoint.useFixedDelay* | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | false | MEDIUM
 | *camel.component.apns.apnsService* | The ApnsService to use. The org.apache.camel.component.apns.factory.ApnsServiceFactory can be used to build a ApnsService | null | true | HIGH
 | *camel.component.apns.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.apns.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.apns.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSinkConnectorConfig.java b/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSinkConnectorConfig.java
index d91709c..99341d4 100644
--- a/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSinkConnectorConfig.java
+++ b/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSinkConnectorConfig.java
@@ -33,9 +33,6 @@ public class CamelApnsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_APNS_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_APNS_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when  [...]
     public static final Boolean CAMEL_SINK_APNS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_APNS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_APNS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_APNS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -45,9 +42,9 @@ public class CamelApnsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_APNS_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.apns.lazyStartProducer";
     public static final String CAMEL_SINK_APNS_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when [...]
     public static final Boolean CAMEL_SINK_APNS_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_APNS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.apns.basicPropertyBinding";
-    public static final String CAMEL_SINK_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_APNS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.apns.autowiredEnabled";
+    public static final String CAMEL_SINK_APNS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_APNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelApnsSinkConnectorConfig(
             ConfigDef config,
@@ -64,11 +61,10 @@ public class CamelApnsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_APNS_PATH_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_APNS_PATH_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_PATH_NAME_DOC);
         conf.define(CAMEL_SINK_APNS_ENDPOINT_TOKENS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_APNS_ENDPOINT_TOKENS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_ENDPOINT_TOKENS_DOC);
         conf.define(CAMEL_SINK_APNS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_APNS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_APNS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_APNS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_APNS_COMPONENT_APNS_SERVICE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_APNS_COMPONENT_APNS_SERVICE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_APNS_COMPONENT_APNS_SERVICE_DOC);
         conf.define(CAMEL_SINK_APNS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_APNS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_APNS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_APNS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_APNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_APNS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSourceConnectorConfig.java b/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSourceConnectorConfig.java
index 8cb77ca..622e55c 100644
--- a/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSourceConnectorConfig.java
+++ b/connectors/camel-apns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/apns/CamelApnsSourceConnectorConfig.java
@@ -47,9 +47,6 @@ public class CamelApnsSourceConnectorConfig
     public static final String CAMEL_SOURCE_APNS_ENDPOINT_POLL_STRATEGY_CONF = "camel.source.endpoint.pollStrategy";
     public static final String CAMEL_SOURCE_APNS_ENDPOINT_POLL_STRATEGY_DOC = "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.";
     public static final String CAMEL_SOURCE_APNS_ENDPOINT_POLL_STRATEGY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_APNS_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_APNS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_APNS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -101,9 +98,9 @@ public class CamelApnsSourceConnectorConfig
     public static final String CAMEL_SOURCE_APNS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.apns.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_APNS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_APNS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_APNS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.apns.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_APNS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.apns.autowiredEnabled";
+    public static final String CAMEL_SOURCE_APNS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_APNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelApnsSourceConnectorConfig(
             ConfigDef config,
@@ -124,7 +121,6 @@ public class CamelApnsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_APNS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_APNS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_APNS_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_POLL_STRATEGY_DOC);
-        conf.define(CAMEL_SOURCE_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_APNS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_APNS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC);
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_APNS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC);
@@ -142,7 +138,7 @@ public class CamelApnsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_APNS_ENDPOINT_USE_FIXED_DELAY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_APNS_ENDPOINT_USE_FIXED_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_ENDPOINT_USE_FIXED_DELAY_DOC);
         conf.define(CAMEL_SOURCE_APNS_COMPONENT_APNS_SERVICE_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_APNS_COMPONENT_APNS_SERVICE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SOURCE_APNS_COMPONENT_APNS_SERVICE_DOC);
         conf.define(CAMEL_SOURCE_APNS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_APNS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_APNS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_APNS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_APNS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_APNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_APNS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-arangodb-kafka-connector/src/generated/resources/camel-arangodb-sink.json b/connectors/camel-arangodb-kafka-connector/src/generated/resources/camel-arangodb-sink.json
index 08f33d9..8d71970 100644
--- a/connectors/camel-arangodb-kafka-connector/src/generated/resources/camel-arangodb-sink.json
+++ b/connectors/camel-arangodb-kafka-connector/src/generated/resources/camel-arangodb-sink.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -145,11 +138,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.arangodb.basicPropertyBinding": {
-			"name": "camel.component.arangodb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.arangodb.autowiredEnabled": {
+			"name": "camel.component.arangodb.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.arangodb.password": {
diff --git a/connectors/camel-arangodb-kafka-connector/src/main/docs/camel-arangodb-kafka-sink-connector.adoc b/connectors/camel-arangodb-kafka-connector/src/main/docs/camel-arangodb-kafka-sink-connector.adoc
index 291a26e..ced1edc 100644
--- a/connectors/camel-arangodb-kafka-connector/src/main/docs/camel-arangodb-kafka-sink-connector.adoc
+++ b/connectors/camel-arangodb-kafka-connector/src/main/docs/camel-arangodb-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.arangodb.CamelArangodbSinkConnec
 ----
 
 
-The camel-arangodb sink connector supports 25 options, which are listed below.
+The camel-arangodb sink connector supports 24 options, which are listed below.
 
 
 
@@ -38,7 +38,6 @@ The camel-arangodb sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.operation* | Operations to perform on ArangoDb. For the operation AQL_QUERY, no need to specify a collection or graph. One of: [SAVE_DOCUMENT] [FIND_DOCUMENT_BY_KEY] [UPDATE_DOCUMENT] [DELETE_DOCUMENT] [AQL_QUERY] [SAVE_VERTEX] [FIND_VERTEX_BY_KEY] [UPDATE_VERTEX] [DELETE_VERTEX] [SAVE_EDGE] [FIND_EDGE_BY_KEY] [UPDATE_EDGE] [DELETE_EDGE] | null | false | MEDIUM
 | *camel.sink.endpoint.port* | ArangoDB exposed port. If host and port are default, this field is Optional. | null | false | MEDIUM
 | *camel.sink.endpoint.vertexCollection* | Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operation on vertices using these operations : SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE. The graph attribute is mandatory. | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.password* | ArangoDB password. If user and password are default, this field is Optional. | null | false | MEDIUM
 | *camel.sink.endpoint.user* | ArangoDB user. If user and password are default, this field is Optional. | null | false | MEDIUM
@@ -51,7 +50,7 @@ The camel-arangodb sink connector supports 25 options, which are listed below.
 | *camel.component.arangodb.operation* | Operations to perform on ArangoDb. For the operation AQL_QUERY, no need to specify a collection or graph. One of: [SAVE_DOCUMENT] [FIND_DOCUMENT_BY_KEY] [UPDATE_DOCUMENT] [DELETE_DOCUMENT] [AQL_QUERY] [SAVE_VERTEX] [FIND_VERTEX_BY_KEY] [UPDATE_VERTEX] [DELETE_VERTEX] [SAVE_EDGE] [FIND_EDGE_BY_KEY] [UPDATE_EDGE] [DELETE_EDGE] | null | false | MEDIUM
 | *camel.component.arangodb.port* | ArangoDB exposed port. If host and port are default, this field is Optional. | null | false | MEDIUM
 | *camel.component.arangodb.vertexCollection* | Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operation on vertices using these operations : SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE. The graph attribute is mandatory. | null | false | MEDIUM
-| *camel.component.arangodb.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.arangodb.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.arangodb.password* | ArangoDB password. If user and password are default, this field is Optional. | null | false | MEDIUM
 | *camel.component.arangodb.user* | ArangoDB user. If user and password are default, this field is Optional. | null | false | MEDIUM
 |===
diff --git a/connectors/camel-arangodb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/arangodb/CamelArangodbSinkConnectorConfig.java b/connectors/camel-arangodb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/arangodb/CamelArangodbSinkConnectorConfig.java
index 574c832..475ea8b 100644
--- a/connectors/camel-arangodb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/arangodb/CamelArangodbSinkConnectorConfig.java
+++ b/connectors/camel-arangodb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/arangodb/CamelArangodbSinkConnectorConfig.java
@@ -53,9 +53,6 @@ public class CamelArangodbSinkConnectorConfig
     public static final String CAMEL_SINK_ARANGODB_ENDPOINT_VERTEX_COLLECTION_CONF = "camel.sink.endpoint.vertexCollection";
     public static final String CAMEL_SINK_ARANGODB_ENDPOINT_VERTEX_COLLECTION_DOC = "Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operation on vertices using these operations : SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE. The graph attribute is mandatory.";
     public static final String CAMEL_SINK_ARANGODB_ENDPOINT_VERTEX_COLLECTION_DEFAULT = null;
-    public static final String CAMEL_SINK_ARANGODB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ARANGODB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ARANGODB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ARANGODB_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_ARANGODB_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_ARANGODB_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -92,9 +89,9 @@ public class CamelArangodbSinkConnectorConfig
     public static final String CAMEL_SINK_ARANGODB_COMPONENT_VERTEX_COLLECTION_CONF = "camel.component.arangodb.vertexCollection";
     public static final String CAMEL_SINK_ARANGODB_COMPONENT_VERTEX_COLLECTION_DOC = "Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operation on vertices using these operations : SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE. The graph attribute is mandatory.";
     public static final String CAMEL_SINK_ARANGODB_COMPONENT_VERTEX_COLLECTION_DEFAULT = null;
-    public static final String CAMEL_SINK_ARANGODB_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.arangodb.basicPropertyBinding";
-    public static final String CAMEL_SINK_ARANGODB_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ARANGODB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ARANGODB_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.arangodb.autowiredEnabled";
+    public static final String CAMEL_SINK_ARANGODB_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ARANGODB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ARANGODB_COMPONENT_PASSWORD_CONF = "camel.component.arangodb.password";
     public static final String CAMEL_SINK_ARANGODB_COMPONENT_PASSWORD_DOC = "ArangoDB password. If user and password are default, this field is Optional.";
     public static final String CAMEL_SINK_ARANGODB_COMPONENT_PASSWORD_DEFAULT = null;
@@ -123,7 +120,6 @@ public class CamelArangodbSinkConnectorConfig
         conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_OPERATION_DOC);
         conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_PORT_CONF, ConfigDef.Type.INT, CAMEL_SINK_ARANGODB_ENDPOINT_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_PORT_DOC);
         conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_VERTEX_COLLECTION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_ENDPOINT_VERTEX_COLLECTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_VERTEX_COLLECTION_DOC);
-        conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ARANGODB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ARANGODB_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_ENDPOINT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_PASSWORD_DOC);
         conf.define(CAMEL_SINK_ARANGODB_ENDPOINT_USER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_ENDPOINT_USER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_ENDPOINT_USER_DOC);
@@ -136,7 +132,7 @@ public class CamelArangodbSinkConnectorConfig
         conf.define(CAMEL_SINK_ARANGODB_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_COMPONENT_OPERATION_DOC);
         conf.define(CAMEL_SINK_ARANGODB_COMPONENT_PORT_CONF, ConfigDef.Type.INT, CAMEL_SINK_ARANGODB_COMPONENT_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_COMPONENT_PORT_DOC);
         conf.define(CAMEL_SINK_ARANGODB_COMPONENT_VERTEX_COLLECTION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_COMPONENT_VERTEX_COLLECTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_COMPONENT_VERTEX_COLLECTION_DOC);
-        conf.define(CAMEL_SINK_ARANGODB_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ARANGODB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ARANGODB_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ARANGODB_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ARANGODB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ARANGODB_COMPONENT_PASSWORD_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_COMPONENT_PASSWORD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_COMPONENT_PASSWORD_DOC);
         conf.define(CAMEL_SINK_ARANGODB_COMPONENT_USER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ARANGODB_COMPONENT_USER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ARANGODB_COMPONENT_USER_DOC);
         return conf;
diff --git a/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-sink.json b/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-sink.json
index 52cc0ca..506fbff 100644
--- a/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-sink.json
+++ b/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-sink.json
@@ -196,13 +196,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -217,11 +210,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.as2.basicPropertyBinding": {
-			"name": "camel.component.as2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.as2.autowiredEnabled": {
+			"name": "camel.component.as2.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.as2.configuration": {
diff --git a/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-source.json b/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-source.json
index 5097d1e..207f25c 100644
--- a/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-source.json
+++ b/connectors/camel-as2-kafka-connector/src/generated/resources/camel-as2-source.json
@@ -201,13 +201,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -222,11 +215,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.as2.basicPropertyBinding": {
-			"name": "camel.component.as2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.as2.autowiredEnabled": {
+			"name": "camel.component.as2.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.as2.configuration": {
diff --git a/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-sink-connector.adoc b/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-sink-connector.adoc
index be8bfda..3b8b1a6 100644
--- a/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-sink-connector.adoc
+++ b/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.as2.CamelAs2SinkConnector
 ----
 
 
-The camel-as2 sink connector supports 35 options, which are listed below.
+The camel-as2 sink connector supports 34 options, which are listed below.
 
 
 
@@ -59,10 +59,9 @@ The camel-as2 sink connector supports 35 options, which are listed below.
 | *camel.sink.endpoint.targetPortNumber* | The port number of target host. -1 indicates the scheme default port. | null | false | MEDIUM
 | *camel.sink.endpoint.userAgent* | The value included in the User-Agent message header identifying the AS2 user agent. | "Camel AS2 Client Endpoint" | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.as2.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.component.as2.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.as2.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.as2.configuration* | Component configuration | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-source-connector.adoc b/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-source-connector.adoc
index 3da5b3e..e53428f 100644
--- a/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-source-connector.adoc
+++ b/connectors/camel-as2-kafka-connector/src/main/docs/camel-as2-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.as2.CamelAs2SourceConnector
 ----
 
 
-The camel-as2 source connector supports 36 options, which are listed below.
+The camel-as2 source connector supports 35 options, which are listed below.
 
 
 
@@ -60,10 +60,9 @@ The camel-as2 source connector supports 36 options, which are listed below.
 | *camel.source.endpoint.userAgent* | The value included in the User-Agent message header identifying the AS2 user agent. | "Camel AS2 Client Endpoint" | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.as2.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.as2.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.as2.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.as2.configuration* | Component configuration | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SinkConnectorConfig.java b/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SinkConnectorConfig.java
index 0092a16..3649103 100644
--- a/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SinkConnectorConfig.java
+++ b/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SinkConnectorConfig.java
@@ -114,18 +114,15 @@ public class CamelAs2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AS2_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_AS2_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when t [...]
     public static final Boolean CAMEL_SINK_AS2_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AS2_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AS2_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AS2_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
     public static final String CAMEL_SINK_AS2_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.as2.lazyStartProducer";
     public static final String CAMEL_SINK_AS2_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when  [...]
     public static final Boolean CAMEL_SINK_AS2_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AS2_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.as2.basicPropertyBinding";
-    public static final String CAMEL_SINK_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AS2_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.as2.autowiredEnabled";
+    public static final String CAMEL_SINK_AS2_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AS2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AS2_COMPONENT_CONFIGURATION_CONF = "camel.component.as2.configuration";
     public static final String CAMEL_SINK_AS2_COMPONENT_CONFIGURATION_DOC = "Component configuration";
     public static final String CAMEL_SINK_AS2_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -172,10 +169,9 @@ public class CamelAs2SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AS2_ENDPOINT_TARGET_PORT_NUMBER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AS2_ENDPOINT_TARGET_PORT_NUMBER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_ENDPOINT_TARGET_PORT_NUMBER_DOC);
         conf.define(CAMEL_SINK_AS2_ENDPOINT_USER_AGENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AS2_ENDPOINT_USER_AGENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_ENDPOINT_USER_AGENT_DOC);
         conf.define(CAMEL_SINK_AS2_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AS2_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AS2_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AS2_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AS2_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AS2_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AS2_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AS2_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AS2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AS2_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AS2_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AS2_COMPONENT_CONFIGURATION_DOC);
         return conf;
     }
diff --git a/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SourceConnectorConfig.java b/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SourceConnectorConfig.java
index 4ba0550..c62b07e 100644
--- a/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SourceConnectorConfig.java
+++ b/connectors/camel-as2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/as2/CamelAs2SourceConnectorConfig.java
@@ -117,18 +117,15 @@ public class CamelAs2SourceConnectorConfig extends CamelSourceConnectorConfig {
     public static final String CAMEL_SOURCE_AS2_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_AS2_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_AS2_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AS2_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_AS2_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_AS2_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
     public static final String CAMEL_SOURCE_AS2_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.as2.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_AS2_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_AS2_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AS2_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.as2.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AS2_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.as2.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AS2_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AS2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AS2_COMPONENT_CONFIGURATION_CONF = "camel.component.as2.configuration";
     public static final String CAMEL_SOURCE_AS2_COMPONENT_CONFIGURATION_DOC = "Component configuration";
     public static final String CAMEL_SOURCE_AS2_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -176,10 +173,9 @@ public class CamelAs2SourceConnectorConfig extends CamelSourceConnectorConfig {
         conf.define(CAMEL_SOURCE_AS2_ENDPOINT_USER_AGENT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AS2_ENDPOINT_USER_AGENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_ENDPOINT_USER_AGENT_DOC);
         conf.define(CAMEL_SOURCE_AS2_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AS2_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AS2_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AS2_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AS2_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AS2_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_AS2_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AS2_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_AS2_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AS2_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AS2_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AS2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AS2_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AS2_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AS2_COMPONENT_CONFIGURATION_DOC);
         return conf;
     }
diff --git a/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-sink.json b/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-sink.json
index 5ffe733..e46bf0c 100644
--- a/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-sink.json
+++ b/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-sink.json
@@ -46,13 +46,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -67,11 +60,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.asterisk.basicPropertyBinding": {
-			"name": "camel.component.asterisk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.asterisk.autowiredEnabled": {
+			"name": "camel.component.asterisk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-source.json b/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-source.json
index b68ffef..bb38c15 100644
--- a/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-source.json
+++ b/connectors/camel-asterisk-kafka-connector/src/generated/resources/camel-asterisk-source.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -73,11 +66,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.asterisk.basicPropertyBinding": {
-			"name": "camel.component.asterisk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.asterisk.autowiredEnabled": {
+			"name": "camel.component.asterisk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-sink-connector.adoc b/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-sink-connector.adoc
index 176c07e..4d31652 100644
--- a/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-sink-connector.adoc
+++ b/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.asterisk.CamelAsteriskSinkConnec
 ----
 
 
-The camel-asterisk sink connector supports 10 options, which are listed below.
+The camel-asterisk sink connector supports 9 options, which are listed below.
 
 
 
@@ -35,10 +35,9 @@ The camel-asterisk sink connector supports 10 options, which are listed below.
 | *camel.sink.endpoint.username* | Login username | null | true | HIGH
 | *camel.sink.endpoint.action* | What action to perform such as getting queue status, sip peers or extension state. One of: [QUEUE_STATUS] [SIP_PEERS] [EXTENSION_STATE] | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.asterisk.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
-| *camel.component.asterisk.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.asterisk.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-source-connector.adoc b/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-source-connector.adoc
index 83cacc1..cc0bfe6 100644
--- a/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-source-connector.adoc
+++ b/connectors/camel-asterisk-kafka-connector/src/main/docs/camel-asterisk-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.asterisk.CamelAsteriskSourceConn
 ----
 
 
-The camel-asterisk source connector supports 11 options, which are listed below.
+The camel-asterisk source connector supports 10 options, which are listed below.
 
 
 
@@ -36,10 +36,9 @@ The camel-asterisk source connector supports 11 options, which are listed below.
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.asterisk.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.asterisk.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.asterisk.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSinkConnectorConfig.java b/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSinkConnectorConfig.java
index 7f88114..d96b621 100644
--- a/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSinkConnectorConfig.java
+++ b/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSinkConnectorConfig.java
@@ -44,18 +44,15 @@ public class CamelAsteriskSinkConnectorConfig
     public static final String CAMEL_SINK_ASTERISK_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ASTERISK_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that w [...]
     public static final Boolean CAMEL_SINK_ASTERISK_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ASTERISK_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_ASTERISK_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_ASTERISK_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
     public static final String CAMEL_SINK_ASTERISK_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.asterisk.lazyStartProducer";
     public static final String CAMEL_SINK_ASTERISK_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that  [...]
     public static final Boolean CAMEL_SINK_ASTERISK_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.asterisk.basicPropertyBinding";
-    public static final String CAMEL_SINK_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.asterisk.autowiredEnabled";
+    public static final String CAMEL_SINK_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAsteriskSinkConnectorConfig(
             ConfigDef config,
@@ -75,10 +72,9 @@ public class CamelAsteriskSinkConnectorConfig
         conf.define(CAMEL_SINK_ASTERISK_ENDPOINT_USERNAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ASTERISK_ENDPOINT_USERNAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_ASTERISK_ENDPOINT_USERNAME_DOC);
         conf.define(CAMEL_SINK_ASTERISK_ENDPOINT_ACTION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ASTERISK_ENDPOINT_ACTION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ASTERISK_ENDPOINT_ACTION_DOC);
         conf.define(CAMEL_SINK_ASTERISK_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ASTERISK_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ASTERISK_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ASTERISK_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ASTERISK_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ASTERISK_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_ASTERISK_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ASTERISK_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ASTERISK_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSourceConnectorConfig.java b/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSourceConnectorConfig.java
index d1bb5eb..de36bef 100644
--- a/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSourceConnectorConfig.java
+++ b/connectors/camel-asterisk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/asterisk/CamelAsteriskSourceConnectorConfig.java
@@ -47,18 +47,15 @@ public class CamelAsteriskSourceConnectorConfig
     public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_ASTERISK_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_ASTERISK_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
     public static final String CAMEL_SOURCE_ASTERISK_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.asterisk.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ASTERISK_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and i [...]
     public static final Boolean CAMEL_SOURCE_ASTERISK_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.asterisk.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.asterisk.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAsteriskSourceConnectorConfig(
             ConfigDef config,
@@ -79,10 +76,9 @@ public class CamelAsteriskSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ASTERISK_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ASTERISK_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ASTERISK_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ASTERISK_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_ASTERISK_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ASTERISK_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ASTERISK_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ASTERISK_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json b/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json
index 5bf8f40..db58112 100644
--- a/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json
+++ b/connectors/camel-atlasmap-kafka-connector/src/generated/resources/camel-atlasmap-sink.json
@@ -55,13 +55,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.propertiesFile": {
 			"name": "camel.sink.endpoint.propertiesFile",
 			"description": "The URI of the properties file which is used for AtlasContextFactory initialization.",
@@ -88,12 +81,12 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atlasmap.basicPropertyBinding": {
-			"name": "camel.component.atlasmap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atlasmap.autowiredEnabled": {
+			"name": "camel.component.atlasmap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc b/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc
index 72187e3..908f76d 100644
--- a/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/docs/camel-atlasmap-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atlasmap.CamelAtlasmapSinkConnec
 ----
 
 
-The camel-atlasmap sink connector supports 13 options, which are listed below.
+The camel-atlasmap sink connector supports 12 options, which are listed below.
 
 
 
@@ -36,12 +36,11 @@ The camel-atlasmap sink connector supports 13 options, which are listed below.
 | *camel.sink.endpoint.sourceMapName* | The Exchange property name for a source message map which hold java.util.Map&lt;String, Message&gt; where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source properties where the scope equals to Document ID. | null | false | MEDIUM
 | *camel.sink.endpoint.targetMapMode* | TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores them into a java.util.Map, and the java.util.Map is set to an exchange property if 'targetMapName' is specified, otherwise message body. 'MESSAGE_HEADER': Stores them into message headers. 'EXCHANGE_PROPERTY': Stores them into exchange properties. ) One of: [MAP] [MESSAGE_HEADER] [EXCHANGE_PROPERTY] | "MAP" | false | MEDIUM
 | *camel.sink.endpoint.targetMapName* | The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map. | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.propertiesFile* | The URI of the properties file which is used for AtlasContextFactory initialization. | null | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.atlasmap.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
 | *camel.component.atlasmap.atlasContextFactory* | To use the AtlasContextFactory otherwise a new engine is created. | null | false | MEDIUM
-| *camel.component.atlasmap.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atlasmap.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
@@ -59,8 +58,4 @@ The camel-atlasmap sink connector has no transforms out of the box.
 
 
 The camel-atlasmap sink connector has no aggregation strategies out of the box.
-
-
-
-
 // kafka-connector options: END
diff --git a/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java
index 1e0a715..bda0604 100644
--- a/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java
+++ b/connectors/camel-atlasmap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atlasmap/CamelAtlasmapSinkConnectorConfig.java
@@ -47,9 +47,6 @@ public class CamelAtlasmapSinkConnectorConfig
     public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_CONF = "camel.sink.endpoint.targetMapName";
     public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DOC = "The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map.";
     public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DEFAULT = null;
-    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_CONF = "camel.sink.endpoint.propertiesFile";
     public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DOC = "The URI of the properties file which is used for AtlasContextFactory initialization.";
     public static final String CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DEFAULT = null;
@@ -62,9 +59,9 @@ public class CamelAtlasmapSinkConnectorConfig
     public static final String CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_CONF = "camel.component.atlasmap.atlasContextFactory";
     public static final String CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DOC = "To use the AtlasContextFactory otherwise a new engine is created.";
     public static final String CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DEFAULT = null;
-    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atlasmap.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atlasmap.autowiredEnabled";
+    public static final String CAMEL_SINK_ATLASMAP_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATLASMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAtlasmapSinkConnectorConfig(
             ConfigDef config,
@@ -85,12 +82,11 @@ public class CamelAtlasmapSinkConnectorConfig
         conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_SOURCE_MAP_NAME_DOC);
         conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_MODE_DOC);
         conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_TARGET_MAP_NAME_DOC);
-        conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_PROPERTIES_FILE_DOC);
         conf.define(CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_COMPONENT_ATLAS_CONTEXT_FACTORY_DOC);
-        conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATLASMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATLASMAP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATLASMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATLASMAP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-sink.json b/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-sink.json
index 76aa2e7..a9ba8c9 100644
--- a/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-sink.json
+++ b/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-sink.json
@@ -52,13 +52,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -98,11 +91,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmos.basicPropertyBinding": {
-			"name": "camel.component.atmos.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmos.autowiredEnabled": {
+			"name": "camel.component.atmos.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmos.uri": {
diff --git a/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-source.json b/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-source.json
index d16116c..ea5638b 100644
--- a/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-source.json
+++ b/connectors/camel-atmos-kafka-connector/src/generated/resources/camel-atmos-source.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -110,11 +103,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmos.basicPropertyBinding": {
-			"name": "camel.component.atmos.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmos.autowiredEnabled": {
+			"name": "camel.component.atmos.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmos.uri": {
diff --git a/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-sink-connector.adoc b/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-sink-connector.adoc
index 34f0ab1..f63971a 100644
--- a/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-sink-connector.adoc
+++ b/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atmos.CamelAtmosSinkConnector
 ----
 
 
-The camel-atmos sink connector supports 19 options, which are listed below.
+The camel-atmos sink connector supports 18 options, which are listed below.
 
 
 
@@ -36,14 +36,13 @@ The camel-atmos sink connector supports 19 options, which are listed below.
 | *camel.sink.endpoint.query* | Search query on Atmos | null | false | MEDIUM
 | *camel.sink.endpoint.remotePath* | Where to put files on Atmos | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.uri* | Atomos server uri | null | false | MEDIUM
 | *camel.sink.endpoint.fullTokenId* | Atmos client fullTokenId | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | The secret key to pass to the Atmos client (should be base64 encoded) | null | false | MEDIUM
 | *camel.sink.endpoint.sslValidation* | Atmos SSL validation | false | false | MEDIUM
 | *camel.component.atmos.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then c [...]
-| *camel.component.atmos.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atmos.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atmos.uri* | The URI of the server for the Atmos client to connect to | null | false | MEDIUM
 | *camel.component.atmos.fullTokenId* | The token id to pass to the Atmos client | null | false | MEDIUM
 | *camel.component.atmos.secretKey* | The secret key to pass to the Atmos client (should be base64 encoded) | null | false | MEDIUM
diff --git a/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-source-connector.adoc b/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-source-connector.adoc
index 0561f1f..582d660 100644
--- a/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-source-connector.adoc
+++ b/connectors/camel-atmos-kafka-connector/src/main/docs/camel-atmos-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atmos.CamelAtmosSourceConnector
 ----
 
 
-The camel-atmos source connector supports 21 options, which are listed below.
+The camel-atmos source connector supports 20 options, which are listed below.
 
 
 
@@ -38,14 +38,13 @@ The camel-atmos source connector supports 21 options, which are listed below.
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.uri* | Atomos server uri | null | false | MEDIUM
 | *camel.source.endpoint.fullTokenId* | Atmos client fullTokenId | null | false | MEDIUM
 | *camel.source.endpoint.secretKey* | The secret key to pass to the Atmos client (should be base64 encoded) | null | false | MEDIUM
 | *camel.source.endpoint.sslValidation* | Atmos SSL validation | false | false | MEDIUM
 | *camel.component.atmos.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atmos.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atmos.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atmos.uri* | The URI of the server for the Atmos client to connect to | null | false | MEDIUM
 | *camel.component.atmos.fullTokenId* | The token id to pass to the Atmos client | null | false | MEDIUM
 | *camel.component.atmos.secretKey* | The secret key to pass to the Atmos client (should be base64 encoded) | null | false | MEDIUM
diff --git a/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSinkConnectorConfig.java b/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSinkConnectorConfig.java
index 7a8500a..0f662d2 100644
--- a/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSinkConnectorConfig.java
+++ b/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSinkConnectorConfig.java
@@ -45,9 +45,6 @@ public class CamelAtmosSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_ATMOS_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATMOS_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when [...]
     public static final Boolean CAMEL_SINK_ATMOS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATMOS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_ATMOS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_ATMOS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -66,9 +63,9 @@ public class CamelAtmosSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_ATMOS_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atmos.lazyStartProducer";
     public static final String CAMEL_SINK_ATMOS_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that whe [...]
     public static final Boolean CAMEL_SINK_ATMOS_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atmos.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATMOS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atmos.autowiredEnabled";
+    public static final String CAMEL_SINK_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATMOS_COMPONENT_URI_CONF = "camel.component.atmos.uri";
     public static final String CAMEL_SINK_ATMOS_COMPONENT_URI_DOC = "The URI of the server for the Atmos client to connect to";
     public static final String CAMEL_SINK_ATMOS_COMPONENT_URI_DEFAULT = null;
@@ -101,14 +98,13 @@ public class CamelAtmosSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_QUERY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_ENDPOINT_QUERY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_QUERY_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_REMOTE_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_ENDPOINT_REMOTE_PATH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_REMOTE_PATH_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_URI_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_ENDPOINT_URI_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_URI_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_FULL_TOKEN_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_ENDPOINT_FULL_TOKEN_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_FULL_TOKEN_ID_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_ATMOS_ENDPOINT_SSL_VALIDATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_ENDPOINT_SSL_VALIDATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_ENDPOINT_SSL_VALIDATION_DOC);
         conf.define(CAMEL_SINK_ATMOS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATMOS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATMOS_COMPONENT_URI_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_COMPONENT_URI_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_COMPONENT_URI_DOC);
         conf.define(CAMEL_SINK_ATMOS_COMPONENT_FULL_TOKEN_ID_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_COMPONENT_FULL_TOKEN_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_COMPONENT_FULL_TOKEN_ID_DOC);
         conf.define(CAMEL_SINK_ATMOS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOS_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSourceConnectorConfig.java b/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSourceConnectorConfig.java
index e9c3f05..c8c31e5 100644
--- a/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSourceConnectorConfig.java
+++ b/connectors/camel-atmos-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmos/CamelAtmosSourceConnectorConfig.java
@@ -53,9 +53,6 @@ public class CamelAtmosSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_ATMOS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_ATMOS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -74,9 +71,9 @@ public class CamelAtmosSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATMOS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atmos.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATMOS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_ATMOS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atmos.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATMOS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atmos.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATMOS_COMPONENT_URI_CONF = "camel.component.atmos.uri";
     public static final String CAMEL_SOURCE_ATMOS_COMPONENT_URI_DOC = "The URI of the server for the Atmos client to connect to";
     public static final String CAMEL_SOURCE_ATMOS_COMPONENT_URI_DEFAULT = null;
@@ -111,14 +108,13 @@ public class CamelAtmosSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_URI_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_ENDPOINT_URI_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_URI_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_FULL_TOKEN_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_ENDPOINT_FULL_TOKEN_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_FULL_TOKEN_ID_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_ENDPOINT_SSL_VALIDATION_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_ENDPOINT_SSL_VALIDATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_ENDPOINT_SSL_VALIDATION_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATMOS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATMOS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_COMPONENT_URI_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_COMPONENT_URI_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_COMPONENT_URI_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_COMPONENT_FULL_TOKEN_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_COMPONENT_FULL_TOKEN_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_COMPONENT_FULL_TOKEN_ID_DOC);
         conf.define(CAMEL_SOURCE_ATMOS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOS_COMPONENT_SECRET_KEY_DOC);
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-sink.json b/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-sink.json
index 471c142..cec8c98 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-sink.json
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-sink.json
@@ -76,13 +76,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.mapHttpMessageBody": {
 			"name": "camel.sink.endpoint.mapHttpMessageBody",
 			"description": "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping.",
@@ -125,11 +118,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmosphere-websocket.basicPropertyBinding": {
-			"name": "camel.component.atmosphere-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmosphere-websocket.autowiredEnabled": {
+			"name": "camel.component.atmosphere-websocket.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmosphere-websocket.httpBinding": {
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-source.json b/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-source.json
index 6980b7d..52ac73b 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-source.json
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/generated/resources/camel-atmosphere-websocket-source.json
@@ -155,13 +155,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.mapHttpMessageBody": {
 			"name": "camel.source.endpoint.mapHttpMessageBody",
 			"description": "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping.",
@@ -230,11 +223,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atmosphere-websocket.basicPropertyBinding": {
-			"name": "camel.component.atmosphere-websocket.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atmosphere-websocket.autowiredEnabled": {
+			"name": "camel.component.atmosphere-websocket.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atmosphere-websocket.httpBinding": {
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-sink-connector.adoc b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-sink-connector.adoc
index 41a31b7..f3eb2c7 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-sink-connector.adoc
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atmospherewebsocket.CamelAtmosph
 ----
 
 
-The camel-atmosphere-websocket sink connector supports 21 options, which are listed below.
+The camel-atmosphere-websocket sink connector supports 20 options, which are listed below.
 
 
 
@@ -39,14 +39,13 @@ The camel-atmosphere-websocket sink connector supports 21 options, which are lis
 | *camel.sink.endpoint.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.sink.endpoint.bridgeEndpoint* | If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back. | false | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.mapHttpMessageBody* | If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping. | true | false | MEDIUM
 | *camel.sink.endpoint.mapHttpMessageFormUrlEncoded Body* | If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping. | true | false | MEDIUM
 | *camel.sink.endpoint.mapHttpMessageHeaders* | If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping. | true | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.atmosphere-websocket.lazyStart Producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is  [...]
 | *camel.component.atmosphere-websocket.allowJava SerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.atmosphere-websocket.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atmosphere-websocket.autowired Enabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atmosphere-websocket.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.component.atmosphere-websocket.http Configuration* | To use the shared HttpConfiguration as base configuration. | null | false | MEDIUM
 | *camel.component.atmosphere-websocket.headerFilter Strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-source-connector.adoc b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-source-connector.adoc
index 37851f5..a1e260f 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-source-connector.adoc
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/docs/camel-atmosphere-websocket-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atmospherewebsocket.CamelAtmosph
 ----
 
 
-The camel-atmosphere-websocket source connector supports 37 options, which are listed below.
+The camel-atmosphere-websocket source connector supports 36 options, which are listed below.
 
 
 
@@ -51,7 +51,6 @@ The camel-atmosphere-websocket source connector supports 37 options, which are l
 | *camel.source.endpoint.fileNameExtWhitelist* | Whitelist of accepted filename extensions for accepting uploaded files. Multiple extensions can be separated by comma, such as txt,xml. | null | false | MEDIUM
 | *camel.source.endpoint.optionsEnabled* | Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off. | false | false | MEDIUM
 | *camel.source.endpoint.traceEnabled* | Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off. | false | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.mapHttpMessageBody* | If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping. | true | false | MEDIUM
 | *camel.source.endpoint.mapHttpMessageFormUrlEncoded Body* | If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping. | true | false | MEDIUM
 | *camel.source.endpoint.mapHttpMessageHeaders* | If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping. | true | false | MEDIUM
@@ -62,7 +61,7 @@ The camel-atmosphere-websocket source connector supports 37 options, which are l
 | *camel.component.atmosphere-websocket.fileNameExt Whitelist* | Whitelist of accepted filename extensions for accepting uploaded files. Multiple extensions can be separated by comma, such as txt,xml. | null | false | MEDIUM
 | *camel.component.atmosphere-websocket.httpRegistry* | To use a custom org.apache.camel.component.servlet.HttpRegistry. | null | false | MEDIUM
 | *camel.component.atmosphere-websocket.allowJava SerializedObject* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | false | MEDIUM
-| *camel.component.atmosphere-websocket.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atmosphere-websocket.autowired Enabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atmosphere-websocket.httpBinding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | null | false | MEDIUM
 | *camel.component.atmosphere-websocket.http Configuration* | To use the shared HttpConfiguration as base configuration. | null | false | MEDIUM
 | *camel.component.atmosphere-websocket.headerFilter Strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | null | false | MEDIUM
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSinkConnectorConfig.java b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSinkConnectorConfig.java
index 4c829dd..93ca186 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSinkConnectorConfig.java
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSinkConnectorConfig.java
@@ -56,9 +56,6 @@ public class CamelAtmospherewebsocketSinkConnectorConfig
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Be [...]
     public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF = "camel.sink.endpoint.mapHttpMessageBody";
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC = "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping.";
     public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT = true;
@@ -77,9 +74,9 @@ public class CamelAtmospherewebsocketSinkConnectorConfig
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.atmosphere-websocket.allowJavaSerializedObject";
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atmosphere-websocket.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atmosphere-websocket.autowiredEnabled";
+    public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_CONF = "camel.component.atmosphere-websocket.httpBinding";
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DOC = "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.";
     public static final String CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DEFAULT = null;
@@ -113,14 +110,13 @@ public class CamelAtmospherewebsocketSinkConnectorConfig
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_HTTP_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_HTTP_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_HTTP_BINDING_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BRIDGE_ENDPOINT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BRIDGE_ENDPOINT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BRIDGE_ENDPOINT_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATMOSPHEREWEBSOCKET_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
diff --git a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSourceConnectorConfig.java b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSourceConnectorConfig.java
index 8f15308..489df7a 100644
--- a/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSourceConnectorConfig.java
+++ b/connectors/camel-atmosphere-websocket-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atmospherewebsocket/CamelAtmospherewebsocketSourceConnectorConfig.java
@@ -92,9 +92,6 @@ public class CamelAtmospherewebsocketSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_TRACE_ENABLED_CONF = "camel.source.endpoint.traceEnabled";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_TRACE_ENABLED_DOC = "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off.";
     public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_TRACE_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF = "camel.source.endpoint.mapHttpMessageBody";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC = "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping.";
     public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT = true;
@@ -125,9 +122,9 @@ public class CamelAtmospherewebsocketSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF = "camel.component.atmosphere-websocket.allowJavaSerializedObject";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC = "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.";
     public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atmosphere-websocket.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atmosphere-websocket.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_CONF = "camel.component.atmosphere-websocket.httpBinding";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DOC = "To use a custom HttpBinding to control the mapping between Camel message and HttpClient.";
     public static final String CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DEFAULT = null;
@@ -173,7 +170,6 @@ public class CamelAtmospherewebsocketSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_FILE_NAME_EXT_WHITELIST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_FILE_NAME_EXT_WHITELIST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_FILE_NAME_EXT_WHITELIST_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_OPTIONS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_OPTIONS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_OPTIONS_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_TRACE_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_TRACE_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_TRACE_ENABLED_DOC);
-        conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_BODY_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_FORM_URL_ENCODED_BODY_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_ENDPOINT_MAP_HTTP_MESSAGE_HEADERS_DOC);
@@ -184,7 +180,7 @@ public class CamelAtmospherewebsocketSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_FILE_NAME_EXT_WHITELIST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_FILE_NAME_EXT_WHITELIST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_FILE_NAME_EXT_WHITELIST_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_REGISTRY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_REGISTRY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_REGISTRY_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_ALLOW_JAVA_SERIALIZED_OBJECT_DOC);
-        conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HTTP_CONFIGURATION_DOC);
         conf.define(CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HEADER_FILTER_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HEADER_FILTER_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATMOSPHEREWEBSOCKET_COMPONENT_HEADER_FILTER_STRATEGY_DOC);
diff --git a/connectors/camel-atom-kafka-connector/src/generated/resources/camel-atom-source.json b/connectors/camel-atom-kafka-connector/src/generated/resources/camel-atom-source.json
index b759d6d..a690664 100644
--- a/connectors/camel-atom-kafka-connector/src/generated/resources/camel-atom-source.json
+++ b/connectors/camel-atom-kafka-connector/src/generated/resources/camel-atom-source.json
@@ -100,13 +100,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -214,11 +207,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atom.basicPropertyBinding": {
-			"name": "camel.component.atom.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atom.autowiredEnabled": {
+			"name": "camel.component.atom.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-atom-kafka-connector/src/main/docs/camel-atom-kafka-source-connector.adoc b/connectors/camel-atom-kafka-connector/src/main/docs/camel-atom-kafka-source-connector.adoc
index 335ef07..831267a 100644
--- a/connectors/camel-atom-kafka-connector/src/main/docs/camel-atom-kafka-source-connector.adoc
+++ b/connectors/camel-atom-kafka-connector/src/main/docs/camel-atom-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atom.CamelAtomSourceConnector
 ----
 
 
-The camel-atom source connector supports 32 options, which are listed below.
+The camel-atom source connector supports 31 options, which are listed below.
 
 
 
@@ -43,7 +43,6 @@ The camel-atom source connector supports 32 options, which are listed below.
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.backoffErrorThreshold* | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
 | *camel.source.endpoint.backoffIdleThreshold* | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
@@ -60,7 +59,7 @@ The camel-atom source connector supports 32 options, which are listed below.
 | *camel.source.endpoint.timeUnit* | Time unit for initialDelay and delay options. One of: [NANOSECONDS] [MICROSECONDS] [MILLISECONDS] [SECONDS] [MINUTES] [HOURS] [DAYS] | "MILLISECONDS" | false | MEDIUM
 | *camel.source.endpoint.useFixedDelay* | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | false | MEDIUM
 | *camel.component.atom.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atom.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atom.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-atom-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atom/CamelAtomSourceConnectorConfig.java b/connectors/camel-atom-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atom/CamelAtomSourceConnectorConfig.java
index 530a95b..ff95014 100644
--- a/connectors/camel-atom-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atom/CamelAtomSourceConnectorConfig.java
+++ b/connectors/camel-atom-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atom/CamelAtomSourceConnectorConfig.java
@@ -68,9 +68,6 @@ public class CamelAtomSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOM_ENDPOINT_POLL_STRATEGY_CONF = "camel.source.endpoint.pollStrategy";
     public static final String CAMEL_SOURCE_ATOM_ENDPOINT_POLL_STRATEGY_DOC = "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.";
     public static final String CAMEL_SOURCE_ATOM_ENDPOINT_POLL_STRATEGY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATOM_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOM_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOM_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATOM_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_ATOM_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_ATOM_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -119,9 +116,9 @@ public class CamelAtomSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOM_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atom.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATOM_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_ATOM_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATOM_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atom.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOM_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOM_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATOM_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atom.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATOM_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATOM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAtomSourceConnectorConfig(
             ConfigDef config,
@@ -149,7 +146,6 @@ public class CamelAtomSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOM_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOM_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOM_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_POLL_STRATEGY_DOC);
-        conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOM_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOM_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_ATOM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC);
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_ATOM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC);
@@ -166,7 +162,7 @@ public class CamelAtomSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_TIME_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOM_ENDPOINT_TIME_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_TIME_UNIT_DOC);
         conf.define(CAMEL_SOURCE_ATOM_ENDPOINT_USE_FIXED_DELAY_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOM_ENDPOINT_USE_FIXED_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_ENDPOINT_USE_FIXED_DELAY_DOC);
         conf.define(CAMEL_SOURCE_ATOM_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOM_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATOM_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOM_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATOM_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATOM_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOM_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-sink.json b/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-sink.json
index a003fd5..65f5bfb 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-sink.json
+++ b/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-sink.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-map.basicPropertyBinding": {
-			"name": "camel.component.atomix-map.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-map.autowiredEnabled": {
+			"name": "camel.component.atomix-map.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-map.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-source.json b/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-source.json
index 929a1db..2d54881 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-source.json
+++ b/connectors/camel-atomix-map-kafka-connector/src/generated/resources/camel-atomix-map-source.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -198,11 +191,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-map.basicPropertyBinding": {
-			"name": "camel.component.atomix-map.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-map.autowiredEnabled": {
+			"name": "camel.component.atomix-map.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-map.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-sink-connector.adoc b/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-sink-connector.adoc
index 9f0cc2e..18662c4 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-sink-connector.adoc
+++ b/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixmap.CamelAtomixmapSinkConn
 ----
 
 
-The camel-atomix-map sink connector supports 35 options, which are listed below.
+The camel-atomix-map sink connector supports 34 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-atomix-map sink connector supports 35 options, which are listed below.
 | *camel.sink.endpoint.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.sink.endpoint.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.sink.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -57,7 +56,7 @@ The camel-atomix-map sink connector supports 35 options, which are listed below.
 | *camel.component.atomix-map.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-map.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.component.atomix-map.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...]
-| *camel.component.atomix-map.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-map.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-map.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-map.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-map.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-source-connector.adoc b/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-source-connector.adoc
index 18374ee..5400d84 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-source-connector.adoc
+++ b/connectors/camel-atomix-map-kafka-connector/src/main/docs/camel-atomix-map-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixmap.CamelAtomixmapSourceCo
 ----
 
 
-The camel-atomix-map source connector supports 37 options, which are listed below.
+The camel-atomix-map source connector supports 36 options, which are listed below.
 
 
 
@@ -41,7 +41,6 @@ The camel-atomix-map source connector supports 37 options, which are listed belo
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.source.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.source.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -59,7 +58,7 @@ The camel-atomix-map source connector supports 37 options, which are listed belo
 | *camel.component.atomix-map.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-map.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.component.atomix-map.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atomix-map.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-map.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-map.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-map.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-map.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSinkConnectorConfig.java b/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSinkConnectorConfig.java
index 99029ee..25cd408 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSinkConnectorConfig.java
+++ b/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSinkConnectorConfig.java
@@ -56,9 +56,6 @@ public class CamelAtomixmapSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that  [...]
     public static final Boolean CAMEL_SINK_ATOMIXMAP_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.sink.endpoint.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -110,9 +107,9 @@ public class CamelAtomixmapSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atomix-map.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that [...]
     public static final Boolean CAMEL_SINK_ATOMIXMAP_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-map.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-map.autowiredEnabled";
+    public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-map.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -154,7 +151,6 @@ public class CamelAtomixmapSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMAP_ENDPOINT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXMAP_ENDPOINT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_TTL_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_ENDPOINT_EPHEMERAL_DOC);
@@ -172,7 +168,7 @@ public class CamelAtomixmapSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMAP_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXMAP_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_TTL_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXMAP_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMAP_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMAP_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSourceConnectorConfig.java b/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSourceConnectorConfig.java
index f5782b9..f4371d4 100644
--- a/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSourceConnectorConfig.java
+++ b/connectors/camel-atomix-map-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmap/CamelAtomixmapSourceConnectorConfig.java
@@ -62,9 +62,6 @@ public class CamelAtomixmapSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.source.endpoint.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -116,9 +113,9 @@ public class CamelAtomixmapSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atomix-map.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and  [...]
     public static final Boolean CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-map.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-map.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-map.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -162,7 +159,6 @@ public class CamelAtomixmapSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_ENDPOINT_EPHEMERAL_DOC);
@@ -180,7 +176,7 @@ public class CamelAtomixmapSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_TTL_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMAP_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMAP_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-sink.json b/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-sink.json
index 1e252ff..570b8df 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-sink.json
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-sink.json
@@ -79,13 +79,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -200,11 +193,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-messaging.basicPropertyBinding": {
-			"name": "camel.component.atomix-messaging.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-messaging.autowiredEnabled": {
+			"name": "camel.component.atomix-messaging.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-messaging.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-source.json b/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-source.json
index 8db866d..7f16975 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-source.json
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/generated/resources/camel-atomix-messaging-source.json
@@ -91,13 +91,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -212,11 +205,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-messaging.basicPropertyBinding": {
-			"name": "camel.component.atomix-messaging.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-messaging.autowiredEnabled": {
+			"name": "camel.component.atomix-messaging.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-messaging.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-sink-connector.adoc b/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-sink-connector.adoc
index 42ed3ee..c08b38a 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-sink-connector.adoc
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixmessaging.CamelAtomixmessa
 ----
 
 
-The camel-atomix-messaging sink connector supports 37 options, which are listed below.
+The camel-atomix-messaging sink connector supports 36 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-atomix-messaging sink connector supports 37 options, which are listed
 | *camel.sink.endpoint.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.sink.endpoint.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.sink.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -59,7 +58,7 @@ The camel-atomix-messaging sink connector supports 37 options, which are listed
 | *camel.component.atomix-messaging.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.component.atomix-messaging.transportClass Name* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-messaging.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is proce [...]
-| *camel.component.atomix-messaging.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-messaging.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-messaging.defaultResource Config* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-messaging.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-messaging.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-source-connector.adoc b/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-source-connector.adoc
index e5a81d8..a716469 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-source-connector.adoc
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/main/docs/camel-atomix-messaging-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixmessaging.CamelAtomixmessa
 ----
 
 
-The camel-atomix-messaging source connector supports 39 options, which are listed below.
+The camel-atomix-messaging source connector supports 38 options, which are listed below.
 
 
 
@@ -42,7 +42,6 @@ The camel-atomix-messaging source connector supports 39 options, which are liste
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.source.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.source.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -61,7 +60,7 @@ The camel-atomix-messaging source connector supports 39 options, which are liste
 | *camel.component.atomix-messaging.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.component.atomix-messaging.transportClass Name* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-messaging.bridgeError Handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atomix-messaging.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-messaging.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-messaging.defaultResource Config* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-messaging.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-messaging.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSinkConnectorConfig.java b/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSinkConnectorConfig.java
index 07bc6ac..a03c074 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSinkConnectorConfig.java
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSinkConnectorConfig.java
@@ -59,9 +59,6 @@ public class CamelAtomixmessagingSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware [...]
     public static final Boolean CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.sink.endpoint.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -116,9 +113,9 @@ public class CamelAtomixmessagingSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atomix-messaging.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Bewar [...]
     public static final Boolean CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-messaging.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-messaging.autowiredEnabled";
+    public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-messaging.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -162,7 +159,6 @@ public class CamelAtomixmessagingSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_ENDPOINT_EPHEMERAL_DOC);
@@ -181,7 +177,7 @@ public class CamelAtomixmessagingSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMESSAGING_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSourceConnectorConfig.java b/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSourceConnectorConfig.java
index 996d158..261816a 100644
--- a/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSourceConnectorConfig.java
+++ b/connectors/camel-atomix-messaging-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmessaging/CamelAtomixmessagingSourceConnectorConfig.java
@@ -65,9 +65,6 @@ public class CamelAtomixmessagingSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.source.endpoint.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -122,9 +119,9 @@ public class CamelAtomixmessagingSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atomix-messaging.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR leve [...]
     public static final Boolean CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-messaging.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-messaging.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-messaging.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -170,7 +167,6 @@ public class CamelAtomixmessagingSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_ENDPOINT_EPHEMERAL_DOC);
@@ -189,7 +185,7 @@ public class CamelAtomixmessagingSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXMESSAGING_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-multimap-kafka-connector/src/generated/resources/camel-atomix-multimap-sink.json b/connectors/camel-atomix-multimap-kafka-connector/src/generated/resources/camel-atomix-multimap-sink.json
index 81ffc22..3b6e3b7 100644
--- a/connectors/camel-atomix-multimap-kafka-connector/src/generated/resources/camel-atomix-multimap-sink.json
+++ b/connectors/camel-atomix-multimap-kafka-connector/src/generated/resources/camel-atomix-multimap-sink.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-multimap.basicPropertyBinding": {
-			"name": "camel.component.atomix-multimap.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-multimap.autowiredEnabled": {
+			"name": "camel.component.atomix-multimap.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-multimap.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-multimap-kafka-connector/src/main/docs/camel-atomix-multimap-kafka-sink-connector.adoc b/connectors/camel-atomix-multimap-kafka-connector/src/main/docs/camel-atomix-multimap-kafka-sink-connector.adoc
index 1abe7c0..205d3de 100644
--- a/connectors/camel-atomix-multimap-kafka-connector/src/main/docs/camel-atomix-multimap-kafka-sink-connector.adoc
+++ b/connectors/camel-atomix-multimap-kafka-connector/src/main/docs/camel-atomix-multimap-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixmultimap.CamelAtomixmultim
 ----
 
 
-The camel-atomix-multimap sink connector supports 35 options, which are listed below.
+The camel-atomix-multimap sink connector supports 34 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-atomix-multimap sink connector supports 35 options, which are listed b
 | *camel.sink.endpoint.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.sink.endpoint.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.sink.endpoint.ttl* | The resource ttl. | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.sink.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -57,7 +56,7 @@ The camel-atomix-multimap sink connector supports 35 options, which are listed b
 | *camel.component.atomix-multimap.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.component.atomix-multimap.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-multimap.ttl* | The resource ttl. | null | false | MEDIUM
-| *camel.component.atomix-multimap.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-multimap.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-multimap.defaultResource Config* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-multimap.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-multimap.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-multimap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmultimap/CamelAtomixmultimapSinkConnectorConfig.java b/connectors/camel-atomix-multimap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmultimap/CamelAtomixmultimapSinkConnectorConfig.java
index 0714a83..311e1a2 100644
--- a/connectors/camel-atomix-multimap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmultimap/CamelAtomixmultimapSinkConnectorConfig.java
+++ b/connectors/camel-atomix-multimap-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixmultimap/CamelAtomixmultimapSinkConnectorConfig.java
@@ -56,9 +56,6 @@ public class CamelAtomixmultimapSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TTL_CONF = "camel.sink.endpoint.ttl";
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TTL_DOC = "The resource ttl.";
     public static final Long CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TTL_DEFAULT = null;
-    public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.sink.endpoint.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -110,9 +107,9 @@ public class CamelAtomixmultimapSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TTL_CONF = "camel.component.atomix-multimap.ttl";
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TTL_DOC = "The resource ttl.";
     public static final Long CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TTL_DEFAULT = null;
-    public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-multimap.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-multimap.autowiredEnabled";
+    public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-multimap.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -155,7 +152,6 @@ public class CamelAtomixmultimapSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_TTL_DOC);
-        conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_ENDPOINT_EPHEMERAL_DOC);
@@ -173,7 +169,7 @@ public class CamelAtomixmultimapSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_TTL_DOC);
-        conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXMULTIMAP_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-sink.json b/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-sink.json
index ad929a3..46bf77f 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-sink.json
+++ b/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -162,11 +155,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-queue.basicPropertyBinding": {
-			"name": "camel.component.atomix-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-queue.autowiredEnabled": {
+			"name": "camel.component.atomix-queue.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-queue.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-source.json b/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-source.json
index fd1c961..db3757b 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-source.json
+++ b/connectors/camel-atomix-queue-kafka-connector/src/generated/resources/camel-atomix-queue-source.json
@@ -72,13 +72,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -174,11 +167,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-queue.basicPropertyBinding": {
-			"name": "camel.component.atomix-queue.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-queue.autowiredEnabled": {
+			"name": "camel.component.atomix-queue.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-queue.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-sink-connector.adoc b/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-sink-connector.adoc
index ce7c91f..c98139b 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-sink-connector.adoc
+++ b/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixqueue.CamelAtomixqueueSink
 ----
 
 
-The camel-atomix-queue sink connector supports 31 options, which are listed below.
+The camel-atomix-queue sink connector supports 30 options, which are listed below.
 
 
 
@@ -37,7 +37,6 @@ The camel-atomix-queue sink connector supports 31 options, which are listed belo
 | *camel.sink.endpoint.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.sink.endpoint.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.sink.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-atomix-queue sink connector supports 31 options, which are listed belo
 | *camel.component.atomix-queue.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.component.atomix-queue.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-queue.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed [...]
-| *camel.component.atomix-queue.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-queue.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-queue.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-queue.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-queue.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-source-connector.adoc b/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-source-connector.adoc
index 04e910b..1c825f7 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-source-connector.adoc
+++ b/connectors/camel-atomix-queue-kafka-connector/src/main/docs/camel-atomix-queue-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixqueue.CamelAtomixqueueSour
 ----
 
 
-The camel-atomix-queue source connector supports 33 options, which are listed below.
+The camel-atomix-queue source connector supports 32 options, which are listed below.
 
 
 
@@ -39,7 +39,6 @@ The camel-atomix-queue source connector supports 33 options, which are listed be
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.source.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.source.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -55,7 +54,7 @@ The camel-atomix-queue source connector supports 33 options, which are listed be
 | *camel.component.atomix-queue.resultHeader* | The header that wil carry the result. | null | false | MEDIUM
 | *camel.component.atomix-queue.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-queue.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atomix-queue.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-queue.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-queue.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-queue.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-queue.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSinkConnectorConfig.java b/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSinkConnectorConfig.java
index 025bba5..ea0ea2a 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSinkConnectorConfig.java
+++ b/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSinkConnectorConfig.java
@@ -50,9 +50,6 @@ public class CamelAtomixqueueSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware tha [...]
     public static final Boolean CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.sink.endpoint.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -98,9 +95,9 @@ public class CamelAtomixqueueSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atomix-queue.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware th [...]
     public static final Boolean CAMEL_SINK_ATOMIXQUEUE_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-queue.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-queue.autowiredEnabled";
+    public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-queue.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -140,7 +137,6 @@ public class CamelAtomixqueueSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_ENDPOINT_EPHEMERAL_DOC);
@@ -156,7 +152,7 @@ public class CamelAtomixqueueSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXQUEUE_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXQUEUE_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSourceConnectorConfig.java b/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSourceConnectorConfig.java
index 635ba03..4eb5851 100644
--- a/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSourceConnectorConfig.java
+++ b/connectors/camel-atomix-queue-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixqueue/CamelAtomixqueueSourceConnectorConfig.java
@@ -56,9 +56,6 @@ public class CamelAtomixqueueSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.source.endpoint.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -104,9 +101,9 @@ public class CamelAtomixqueueSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atomix-queue.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level an [...]
     public static final Boolean CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-queue.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-queue.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-queue.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -149,7 +146,6 @@ public class CamelAtomixqueueSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_ENDPOINT_EPHEMERAL_DOC);
@@ -165,7 +161,7 @@ public class CamelAtomixqueueSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_RESULT_HEADER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_RESULT_HEADER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_RESULT_HEADER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXQUEUE_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-sink.json b/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-sink.json
index 43c8814..fd759f5 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-sink.json
+++ b/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -174,11 +167,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-set.basicPropertyBinding": {
-			"name": "camel.component.atomix-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-set.autowiredEnabled": {
+			"name": "camel.component.atomix-set.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-set.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-source.json b/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-source.json
index 2b1c264..52fd093 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-source.json
+++ b/connectors/camel-atomix-set-kafka-connector/src/generated/resources/camel-atomix-set-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-set.basicPropertyBinding": {
-			"name": "camel.component.atomix-set.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-set.autowiredEnabled": {
+			"name": "camel.component.atomix-set.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-set.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-sink-connector.adoc b/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-sink-connector.adoc
index 1233317..d62f71f 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-sink-connector.adoc
+++ b/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixset.CamelAtomixsetSinkConn
 ----
 
 
-The camel-atomix-set sink connector supports 33 options, which are listed below.
+The camel-atomix-set sink connector supports 32 options, which are listed below.
 
 
 
@@ -38,7 +38,6 @@ The camel-atomix-set sink connector supports 33 options, which are listed below.
 | *camel.sink.endpoint.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.sink.endpoint.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.sink.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -55,7 +54,7 @@ The camel-atomix-set sink connector supports 33 options, which are listed below.
 | *camel.component.atomix-set.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-set.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.component.atomix-set.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...]
-| *camel.component.atomix-set.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-set.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-set.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-set.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-set.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-source-connector.adoc b/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-source-connector.adoc
index 9f6af8f..0e22097 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-source-connector.adoc
+++ b/connectors/camel-atomix-set-kafka-connector/src/main/docs/camel-atomix-set-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixset.CamelAtomixsetSourceCo
 ----
 
 
-The camel-atomix-set source connector supports 35 options, which are listed below.
+The camel-atomix-set source connector supports 34 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-atomix-set source connector supports 35 options, which are listed belo
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.source.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.source.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -57,7 +56,7 @@ The camel-atomix-set source connector supports 35 options, which are listed belo
 | *camel.component.atomix-set.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-set.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.component.atomix-set.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atomix-set.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-set.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-set.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-set.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-set.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSinkConnectorConfig.java b/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSinkConnectorConfig.java
index f94a13b..7b2e9c6 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSinkConnectorConfig.java
+++ b/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSinkConnectorConfig.java
@@ -53,9 +53,6 @@ public class CamelAtomixsetSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that  [...]
     public static final Boolean CAMEL_SINK_ATOMIXSET_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.sink.endpoint.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -104,9 +101,9 @@ public class CamelAtomixsetSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atomix-set.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that [...]
     public static final Boolean CAMEL_SINK_ATOMIXSET_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-set.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-set.autowiredEnabled";
+    public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-set.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -147,7 +144,6 @@ public class CamelAtomixsetSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXSET_ENDPOINT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXSET_ENDPOINT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_TTL_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_ENDPOINT_EPHEMERAL_DOC);
@@ -164,7 +160,7 @@ public class CamelAtomixsetSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXSET_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXSET_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_TTL_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXSET_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXSET_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXSET_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSourceConnectorConfig.java b/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSourceConnectorConfig.java
index f5e8e31..5156937 100644
--- a/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSourceConnectorConfig.java
+++ b/connectors/camel-atomix-set-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixset/CamelAtomixsetSourceConnectorConfig.java
@@ -59,9 +59,6 @@ public class CamelAtomixsetSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.source.endpoint.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -110,9 +107,9 @@ public class CamelAtomixsetSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atomix-set.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and  [...]
     public static final Boolean CAMEL_SOURCE_ATOMIXSET_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-set.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-set.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-set.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -155,7 +152,6 @@ public class CamelAtomixsetSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_ENDPOINT_EPHEMERAL_DOC);
@@ -172,7 +168,7 @@ public class CamelAtomixsetSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_ATOMIXSET_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_TTL_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATOMIXSET_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXSET_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXSET_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXSET_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-sink.json b/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-sink.json
index caa6fec..e661b78 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-sink.json
+++ b/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-sink.json
@@ -66,13 +66,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.defaultResourceConfig": {
 			"name": "camel.sink.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -174,11 +167,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-value.basicPropertyBinding": {
-			"name": "camel.component.atomix-value.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-value.autowiredEnabled": {
+			"name": "camel.component.atomix-value.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-value.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-source.json b/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-source.json
index 6fc8726..4c45c3a 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-source.json
+++ b/connectors/camel-atomix-value-kafka-connector/src/generated/resources/camel-atomix-value-source.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.defaultResourceConfig": {
 			"name": "camel.source.endpoint.defaultResourceConfig",
 			"description": "The cluster wide default resource configuration.",
@@ -186,11 +179,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.atomix-value.basicPropertyBinding": {
-			"name": "camel.component.atomix-value.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.atomix-value.autowiredEnabled": {
+			"name": "camel.component.atomix-value.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.atomix-value.defaultResourceConfig": {
diff --git a/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-sink-connector.adoc b/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-sink-connector.adoc
index 5fb7795..acab26e 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-sink-connector.adoc
+++ b/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixvalue.CamelAtomixvalueSink
 ----
 
 
-The camel-atomix-value sink connector supports 33 options, which are listed below.
+The camel-atomix-value sink connector supports 32 options, which are listed below.
 
 
 
@@ -38,7 +38,6 @@ The camel-atomix-value sink connector supports 33 options, which are listed belo
 | *camel.sink.endpoint.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.sink.endpoint.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.sink.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.sink.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -55,7 +54,7 @@ The camel-atomix-value sink connector supports 33 options, which are listed belo
 | *camel.component.atomix-value.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-value.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.component.atomix-value.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed [...]
-| *camel.component.atomix-value.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-value.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-value.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-value.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-value.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-source-connector.adoc b/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-source-connector.adoc
index 6ca4039..ba6cd1d 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-source-connector.adoc
+++ b/connectors/camel-atomix-value-kafka-connector/src/main/docs/camel-atomix-value-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.atomixvalue.CamelAtomixvalueSour
 ----
 
 
-The camel-atomix-value source connector supports 35 options, which are listed below.
+The camel-atomix-value source connector supports 34 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-atomix-value source connector supports 35 options, which are listed be
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.source.endpoint.defaultResourceOptions* | The local default resource options. | null | false | MEDIUM
 | *camel.source.endpoint.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
@@ -57,7 +56,7 @@ The camel-atomix-value source connector supports 35 options, which are listed be
 | *camel.component.atomix-value.transportClassName* | The class name (fqn) of the Atomix transport | "io.atomix.catalyst.transport.netty.NettyTransport" | false | MEDIUM
 | *camel.component.atomix-value.ttl* | The resource ttl. | null | false | MEDIUM
 | *camel.component.atomix-value.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.atomix-value.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.atomix-value.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.atomix-value.defaultResourceConfig* | The cluster wide default resource configuration. | null | false | MEDIUM
 | *camel.component.atomix-value.defaultResource Options* | The local default resource options. | null | false | MEDIUM
 | *camel.component.atomix-value.ephemeral* | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | false | MEDIUM
diff --git a/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSinkConnectorConfig.java b/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSinkConnectorConfig.java
index 1b95a47..a9d227a 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSinkConnectorConfig.java
+++ b/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSinkConnectorConfig.java
@@ -53,9 +53,6 @@ public class CamelAtomixvalueSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware tha [...]
     public static final Boolean CAMEL_SINK_ATOMIXVALUE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.sink.endpoint.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -104,9 +101,9 @@ public class CamelAtomixvalueSinkConnectorConfig
     public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.atomix-value.lazyStartProducer";
     public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware th [...]
     public static final Boolean CAMEL_SINK_ATOMIXVALUE_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-value.basicPropertyBinding";
-    public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-value.autowiredEnabled";
+    public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-value.defaultResourceConfig";
     public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -147,7 +144,6 @@ public class CamelAtomixvalueSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_TTL_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_ENDPOINT_EPHEMERAL_DOC);
@@ -164,7 +160,7 @@ public class CamelAtomixvalueSinkConnectorConfig
         conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXVALUE_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SINK_ATOMIXVALUE_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_TTL_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SINK_ATOMIXVALUE_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_ATOMIXVALUE_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_ATOMIXVALUE_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSourceConnectorConfig.java b/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSourceConnectorConfig.java
index e4d3fd9..89221a6 100644
--- a/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSourceConnectorConfig.java
+++ b/connectors/camel-atomix-value-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/atomixvalue/CamelAtomixvalueSourceConnectorConfig.java
@@ -59,9 +59,6 @@ public class CamelAtomixvalueSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.source.endpoint.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -110,9 +107,9 @@ public class CamelAtomixvalueSourceConnectorConfig
     public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.atomix-value.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level an [...]
     public static final Boolean CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.atomix-value.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.atomix-value.autowiredEnabled";
+    public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF = "camel.component.atomix-value.defaultResourceConfig";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC = "The cluster wide default resource configuration.";
     public static final String CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT = null;
@@ -156,7 +153,6 @@ public class CamelAtomixvalueSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_ENDPOINT_EPHEMERAL_DOC);
@@ -173,7 +169,7 @@ public class CamelAtomixvalueSourceConnectorConfig
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_TRANSPORT_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_TRANSPORT_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_TRANSPORT_CLASS_NAME_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_TTL_CONF, ConfigDef.Type.LONG, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_TTL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_TTL_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_CONFIG_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_DEFAULT_RESOURCE_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_EPHEMERAL_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_EPHEMERAL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_ATOMIXVALUE_COMPONENT_EPHEMERAL_DOC);
diff --git a/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-sink.json b/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-sink.json
index ec3209f..fc86f1e 100644
--- a/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-sink.json
+++ b/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,11 +130,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.avro.basicPropertyBinding": {
-			"name": "camel.component.avro.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.avro.autowiredEnabled": {
+			"name": "camel.component.avro.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.avro.configuration": {
diff --git a/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-source.json b/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-source.json
index 0d60fc9..4494919 100644
--- a/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-source.json
+++ b/connectors/camel-avro-kafka-connector/src/generated/resources/camel-avro-source.json
@@ -90,13 +90,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -149,11 +142,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.avro.basicPropertyBinding": {
-			"name": "camel.component.avro.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.avro.autowiredEnabled": {
+			"name": "camel.component.avro.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.avro.configuration": {
diff --git a/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-sink-connector.adoc b/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-sink-connector.adoc
index 01630f2..45aa9ba 100644
--- a/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-sink-connector.adoc
+++ b/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.avro.CamelAvroSinkConnector
 ----
 
 
-The camel-avro sink connector supports 22 options, which are listed below.
+The camel-avro sink connector supports 21 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-avro sink connector supports 22 options, which are listed below.
 | *camel.sink.endpoint.singleParameter* | If true, consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message | false | false | MEDIUM
 | *camel.sink.endpoint.uriAuthority* | Authority to use (username and password) | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.avro.protocol* | Avro protocol to use | null | false | MEDIUM
 | *camel.component.avro.protocolClassName* | Avro protocol to use defined by the FQN class name | null | false | MEDIUM
@@ -49,7 +48,7 @@ The camel-avro sink connector supports 22 options, which are listed below.
 | *camel.component.avro.singleParameter* | If true, consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message | false | false | MEDIUM
 | *camel.component.avro.uriAuthority* | Authority to use (username and password) | null | false | MEDIUM
 | *camel.component.avro.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cr [...]
-| *camel.component.avro.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.avro.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.avro.configuration* | To use a shared AvroConfiguration to configure options once | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-source-connector.adoc b/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-source-connector.adoc
index 23c810c..3838645 100644
--- a/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-source-connector.adoc
+++ b/connectors/camel-avro-kafka-connector/src/main/docs/camel-avro-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.avro.CamelAvroSourceConnector
 ----
 
 
-The camel-avro source connector supports 24 options, which are listed below.
+The camel-avro source connector supports 23 options, which are listed below.
 
 
 
@@ -42,7 +42,6 @@ The camel-avro source connector supports 24 options, which are listed below.
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.avro.protocol* | Avro protocol to use | null | false | MEDIUM
 | *camel.component.avro.protocolClassName* | Avro protocol to use defined by the FQN class name | null | false | MEDIUM
@@ -51,7 +50,7 @@ The camel-avro source connector supports 24 options, which are listed below.
 | *camel.component.avro.singleParameter* | If true, consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message | false | false | MEDIUM
 | *camel.component.avro.uriAuthority* | Authority to use (username and password) | null | false | MEDIUM
 | *camel.component.avro.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
-| *camel.component.avro.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.avro.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.avro.configuration* | To use a shared AvroConfiguration to configure options once | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSinkConnectorConfig.java b/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSinkConnectorConfig.java
index 1fe4e84..b435bb2 100644
--- a/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSinkConnectorConfig.java
+++ b/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAvroSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AVRO_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_AVRO_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when  [...]
     public static final Boolean CAMEL_SINK_AVRO_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AVRO_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AVRO_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AVRO_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -84,9 +81,9 @@ public class CamelAvroSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AVRO_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.avro.lazyStartProducer";
     public static final String CAMEL_SINK_AVRO_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when [...]
     public static final Boolean CAMEL_SINK_AVRO_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.avro.basicPropertyBinding";
-    public static final String CAMEL_SINK_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AVRO_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.avro.autowiredEnabled";
+    public static final String CAMEL_SINK_AVRO_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AVRO_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AVRO_COMPONENT_CONFIGURATION_CONF = "camel.component.avro.configuration";
     public static final String CAMEL_SINK_AVRO_COMPONENT_CONFIGURATION_DOC = "To use a shared AvroConfiguration to configure options once";
     public static final String CAMEL_SINK_AVRO_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -114,7 +111,6 @@ public class CamelAvroSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AVRO_ENDPOINT_SINGLE_PARAMETER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_ENDPOINT_SINGLE_PARAMETER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_ENDPOINT_SINGLE_PARAMETER_DOC);
         conf.define(CAMEL_SINK_AVRO_ENDPOINT_URI_AUTHORITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AVRO_ENDPOINT_URI_AUTHORITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_ENDPOINT_URI_AUTHORITY_DOC);
         conf.define(CAMEL_SINK_AVRO_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AVRO_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AVRO_COMPONENT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AVRO_COMPONENT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AVRO_COMPONENT_PROTOCOL_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AVRO_COMPONENT_PROTOCOL_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_PROTOCOL_CLASS_NAME_DOC);
@@ -123,7 +119,7 @@ public class CamelAvroSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AVRO_COMPONENT_SINGLE_PARAMETER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_COMPONENT_SINGLE_PARAMETER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_SINGLE_PARAMETER_DOC);
         conf.define(CAMEL_SINK_AVRO_COMPONENT_URI_AUTHORITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AVRO_COMPONENT_URI_AUTHORITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_URI_AUTHORITY_DOC);
         conf.define(CAMEL_SINK_AVRO_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AVRO_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AVRO_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AVRO_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AVRO_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AVRO_COMPONENT_CONFIGURATION_DOC);
         return conf;
     }
diff --git a/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSourceConnectorConfig.java b/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSourceConnectorConfig.java
index 3ad9e86..be6f8a3 100644
--- a/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSourceConnectorConfig.java
+++ b/connectors/camel-avro-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/avro/CamelAvroSourceConnectorConfig.java
@@ -65,9 +65,6 @@ public class CamelAvroSourceConnectorConfig
     public static final String CAMEL_SOURCE_AVRO_ENDPOINT_EXCHANGE_PATTERN_CONF = "camel.source.endpoint.exchangePattern";
     public static final String CAMEL_SOURCE_AVRO_ENDPOINT_EXCHANGE_PATTERN_DOC = "Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut]";
     public static final String CAMEL_SOURCE_AVRO_ENDPOINT_EXCHANGE_PATTERN_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AVRO_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_AVRO_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_AVRO_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -92,9 +89,9 @@ public class CamelAvroSourceConnectorConfig
     public static final String CAMEL_SOURCE_AVRO_COMPONENT_BRIDGE_ERROR_HANDLER_CONF = "camel.component.avro.bridgeErrorHandler";
     public static final String CAMEL_SOURCE_AVRO_COMPONENT_BRIDGE_ERROR_HANDLER_DOC = "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored.";
     public static final Boolean CAMEL_SOURCE_AVRO_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.avro.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AVRO_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.avro.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AVRO_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AVRO_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AVRO_COMPONENT_CONFIGURATION_CONF = "camel.component.avro.configuration";
     public static final String CAMEL_SOURCE_AVRO_COMPONENT_CONFIGURATION_DOC = "To use a shared AvroConfiguration to configure options once";
     public static final String CAMEL_SOURCE_AVRO_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -124,7 +121,6 @@ public class CamelAvroSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AVRO_ENDPOINT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_ENDPOINT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_ENDPOINT_BRIDGE_ERROR_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AVRO_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AVRO_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AVRO_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AVRO_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_ENDPOINT_EXCHANGE_PATTERN_DOC);
-        conf.define(CAMEL_SOURCE_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AVRO_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_AVRO_COMPONENT_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AVRO_COMPONENT_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AVRO_COMPONENT_PROTOCOL_CLASS_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AVRO_COMPONENT_PROTOCOL_CLASS_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_PROTOCOL_CLASS_NAME_DOC);
@@ -133,7 +129,7 @@ public class CamelAvroSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AVRO_COMPONENT_SINGLE_PARAMETER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_COMPONENT_SINGLE_PARAMETER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_SINGLE_PARAMETER_DOC);
         conf.define(CAMEL_SOURCE_AVRO_COMPONENT_URI_AUTHORITY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AVRO_COMPONENT_URI_AUTHORITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_URI_AUTHORITY_DOC);
         conf.define(CAMEL_SOURCE_AVRO_COMPONENT_BRIDGE_ERROR_HANDLER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_COMPONENT_BRIDGE_ERROR_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_BRIDGE_ERROR_HANDLER_DOC);
-        conf.define(CAMEL_SOURCE_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AVRO_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AVRO_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AVRO_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AVRO_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AVRO_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AVRO_COMPONENT_CONFIGURATION_DOC);
         return conf;
     }
diff --git a/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-sink.json b/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-sink.json
index 793e21f..8c612d1 100644
--- a/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-sink.json
+++ b/connectors/camel-aws-cw-kafka-connector/src/generated/resources/camel-aws-cw-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -185,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-cw.basicPropertyBinding": {
-			"name": "camel.component.aws-cw.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-cw.autowiredEnabled": {
+			"name": "camel.component.aws-cw.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-cw.accessKey": {
diff --git a/connectors/camel-aws-cw-kafka-connector/src/main/docs/camel-aws-cw-kafka-sink-connector.adoc b/connectors/camel-aws-cw-kafka-connector/src/main/docs/camel-aws-cw-kafka-sink-connector.adoc
index d279871..6374165 100644
--- a/connectors/camel-aws-cw-kafka-connector/src/main/docs/camel-aws-cw-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-cw-kafka-connector/src/main/docs/camel-aws-cw-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awscw.CamelAwscwSinkConnector
 ----
 
 
-The camel-aws-cw sink connector supports 31 options, which are listed below.
+The camel-aws-cw sink connector supports 30 options, which are listed below.
 
 
 
@@ -41,7 +41,6 @@ The camel-aws-cw sink connector supports 31 options, which are listed below.
 | *camel.sink.endpoint.timestamp* | The metric timestamp | null | false | MEDIUM
 | *camel.sink.endpoint.unit* | The metric unit | null | false | MEDIUM
 | *camel.sink.endpoint.value* | The metric value | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -57,7 +56,7 @@ The camel-aws-cw sink connector supports 31 options, which are listed below.
 | *camel.component.aws-cw.timestamp* | The metric timestamp | null | false | MEDIUM
 | *camel.component.aws-cw.unit* | The metric unit | null | false | MEDIUM
 | *camel.component.aws-cw.value* | The metric value | null | false | MEDIUM
-| *camel.component.aws-cw.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-cw.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-cw.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-cw.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnectorConfig.java b/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnectorConfig.java
index 9449f47..ba028a7 100644
--- a/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnectorConfig.java
+++ b/connectors/camel-aws-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awscw/CamelAwscwSinkConnectorConfig.java
@@ -60,9 +60,6 @@ public class CamelAwscwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSCW_ENDPOINT_VALUE_CONF = "camel.sink.endpoint.value";
     public static final String CAMEL_SINK_AWSCW_ENDPOINT_VALUE_DOC = "The metric value";
     public static final String CAMEL_SINK_AWSCW_ENDPOINT_VALUE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSCW_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSCW_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSCW_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSCW_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSCW_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -108,9 +105,9 @@ public class CamelAwscwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSCW_COMPONENT_VALUE_CONF = "camel.component.aws-cw.value";
     public static final String CAMEL_SINK_AWSCW_COMPONENT_VALUE_DOC = "The metric value";
     public static final String CAMEL_SINK_AWSCW_COMPONENT_VALUE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-cw.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSCW_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSCW_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSCW_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-cw.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSCW_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSCW_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSCW_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-cw.accessKey";
     public static final String CAMEL_SINK_AWSCW_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSCW_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -142,7 +139,6 @@ public class CamelAwscwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSCW_ENDPOINT_TIMESTAMP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_TIMESTAMP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_TIMESTAMP_DOC);
         conf.define(CAMEL_SINK_AWSCW_ENDPOINT_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_UNIT_DOC);
         conf.define(CAMEL_SINK_AWSCW_ENDPOINT_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_VALUE_DOC);
-        conf.define(CAMEL_SINK_AWSCW_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCW_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSCW_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCW_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSCW_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSCW_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_ENDPOINT_SECRET_KEY_DOC);
@@ -158,7 +154,7 @@ public class CamelAwscwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSCW_COMPONENT_TIMESTAMP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_TIMESTAMP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_TIMESTAMP_DOC);
         conf.define(CAMEL_SINK_AWSCW_COMPONENT_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_UNIT_DOC);
         conf.define(CAMEL_SINK_AWSCW_COMPONENT_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_VALUE_DOC);
-        conf.define(CAMEL_SINK_AWSCW_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCW_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSCW_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSCW_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSCW_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSCW_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSCW_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSCW_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSCW_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-sink.json b/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-sink.json
index 4b5b1d1..408e5d3 100644
--- a/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-sink.json
+++ b/connectors/camel-aws-ddb-kafka-connector/src/generated/resources/camel-aws-ddb-sink.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -213,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ddb.basicPropertyBinding": {
-			"name": "camel.component.aws-ddb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ddb.autowiredEnabled": {
+			"name": "camel.component.aws-ddb.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-ddb.accessKey": {
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/main/docs/camel-aws-ddb-kafka-sink-connector.adoc b/connectors/camel-aws-ddb-kafka-connector/src/main/docs/camel-aws-ddb-kafka-sink-connector.adoc
index 34b68b2..6c08ae3 100644
--- a/connectors/camel-aws-ddb-kafka-connector/src/main/docs/camel-aws-ddb-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-ddb-kafka-connector/src/main/docs/camel-aws-ddb-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsddb.CamelAwsddbSinkConnector
 ----
 
 
-The camel-aws-ddb sink connector supports 35 options, which are listed below.
+The camel-aws-ddb sink connector supports 34 options, which are listed below.
 
 
 
@@ -43,7 +43,6 @@ The camel-aws-ddb sink connector supports 35 options, which are listed below.
 | *camel.sink.endpoint.readCapacity* | The provisioned throughput to reserve for reading resources from your table | null | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which DDB client needs to work | null | false | MEDIUM
 | *camel.sink.endpoint.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -61,7 +60,7 @@ The camel-aws-ddb sink connector supports 35 options, which are listed below.
 | *camel.component.aws-ddb.readCapacity* | The provisioned throughput to reserve for reading resources from your table | null | false | MEDIUM
 | *camel.component.aws-ddb.region* | The region in which DDB client needs to work | null | false | MEDIUM
 | *camel.component.aws-ddb.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
-| *camel.component.aws-ddb.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-ddb.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-ddb.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-ddb.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnectorConfig.java b/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnectorConfig.java
index b87b16b..9f17211 100644
--- a/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnectorConfig.java
+++ b/connectors/camel-aws-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddb/CamelAwsddbSinkConnectorConfig.java
@@ -66,9 +66,6 @@ public class CamelAwsddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSDDB_ENDPOINT_WRITE_CAPACITY_CONF = "camel.sink.endpoint.writeCapacity";
     public static final String CAMEL_SINK_AWSDDB_ENDPOINT_WRITE_CAPACITY_DOC = "The provisioned throughput to reserved for writing resources to your table";
     public static final String CAMEL_SINK_AWSDDB_ENDPOINT_WRITE_CAPACITY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSDDB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSDDB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSDDB_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSDDB_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSDDB_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -120,9 +117,9 @@ public class CamelAwsddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSDDB_COMPONENT_WRITE_CAPACITY_CONF = "camel.component.aws-ddb.writeCapacity";
     public static final String CAMEL_SINK_AWSDDB_COMPONENT_WRITE_CAPACITY_DOC = "The provisioned throughput to reserved for writing resources to your table";
     public static final String CAMEL_SINK_AWSDDB_COMPONENT_WRITE_CAPACITY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-ddb.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSDDB_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSDDB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSDDB_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-ddb.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSDDB_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSDDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSDDB_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-ddb.accessKey";
     public static final String CAMEL_SINK_AWSDDB_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSDDB_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -156,7 +153,6 @@ public class CamelAwsddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_READ_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_READ_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_READ_CAPACITY_DOC);
         conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_WRITE_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_WRITE_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_WRITE_CAPACITY_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSDDB_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_ENDPOINT_SECRET_KEY_DOC);
@@ -174,7 +170,7 @@ public class CamelAwsddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSDDB_COMPONENT_READ_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_READ_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_READ_CAPACITY_DOC);
         conf.define(CAMEL_SINK_AWSDDB_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSDDB_COMPONENT_WRITE_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_WRITE_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_WRITE_CAPACITY_DOC);
-        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSDDB_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSDDB_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSDDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSDDB_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSDDB_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSDDB_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSDDB_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-source.json b/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-source.json
index 4d82a94..a5fd1bf 100644
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-source.json
+++ b/connectors/camel-aws-ddbstream-kafka-connector/src/generated/resources/camel-aws-ddbstream-source.json
@@ -104,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -293,11 +286,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ddbstream.basicPropertyBinding": {
-			"name": "camel.component.aws-ddbstream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ddbstream.autowiredEnabled": {
+			"name": "camel.component.aws-ddbstream.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-ddbstream.accessKey": {
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/camel-aws-ddbstream-kafka-source-connector.adoc b/connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/camel-aws-ddbstream-kafka-source-connector.adoc
index 559efab..a8a2842 100644
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/camel-aws-ddbstream-kafka-source-connector.adoc
+++ b/connectors/camel-aws-ddbstream-kafka-connector/src/main/docs/camel-aws-ddbstream-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsddbstream.CamelAwsddbstreamSo
 ----
 
 
-The camel-aws-ddbstream source connector supports 47 options, which are listed below.
+The camel-aws-ddbstream source connector supports 46 options, which are listed below.
 
 
 
@@ -44,7 +44,6 @@ The camel-aws-ddbstream source connector supports 47 options, which are listed b
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.backoffErrorThreshold* | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
 | *camel.source.endpoint.backoffIdleThreshold* | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
@@ -73,7 +72,7 @@ The camel-aws-ddbstream source connector supports 47 options, which are listed b
 | *camel.component.aws-ddbstream.proxyProtocol* | To define a proxy protocol when instantiating the DDBStreams client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-ddbstream.region* | The region in which DDBStreams client needs to work | null | false | MEDIUM
 | *camel.component.aws-ddbstream.sequenceNumber Provider* | Provider for the sequence number when using one of the two ShardIteratorType.{AT,AFTER}_SEQUENCE_NUMBER iterator types. Can be a registry reference or a literal sequence number. | null | false | MEDIUM
-| *camel.component.aws-ddbstream.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-ddbstream.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-ddbstream.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-ddbstream.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnectorConfig.java b/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnectorConfig.java
index bf62a64..c6345fc 100644
--- a/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnectorConfig.java
+++ b/connectors/camel-aws-ddbstream-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsddbstream/CamelAwsddbstreamSourceConnectorConfig.java
@@ -71,9 +71,6 @@ public class CamelAwsddbstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_POLL_STRATEGY_CONF = "camel.source.endpoint.pollStrategy";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_POLL_STRATEGY_DOC = "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_POLL_STRATEGY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -158,9 +155,9 @@ public class CamelAwsddbstreamSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_CONF = "camel.component.aws-ddbstream.sequenceNumberProvider";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_DOC = "Provider for the sequence number when using one of the two ShardIteratorType.{AT,AFTER}_SEQUENCE_NUMBER iterator types. Can be a registry reference or a literal sequence number.";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-ddbstream.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-ddbstream.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-ddbstream.accessKey";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -196,7 +193,6 @@ public class CamelAwsddbstreamSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_POLL_STRATEGY_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC);
@@ -225,7 +221,7 @@ public class CamelAwsddbstreamSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SEQUENCE_NUMBER_PROVIDER_DOC);
-        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSDDBSTREAM_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-ec2-kafka-connector/src/generated/resources/camel-aws-ec2-sink.json b/connectors/camel-aws-ec2-kafka-connector/src/generated/resources/camel-aws-ec2-sink.json
index dfc8181..9f8e241 100644
--- a/connectors/camel-aws-ec2-kafka-connector/src/generated/resources/camel-aws-ec2-sink.json
+++ b/connectors/camel-aws-ec2-kafka-connector/src/generated/resources/camel-aws-ec2-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ec2.basicPropertyBinding": {
-			"name": "camel.component.aws-ec2.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ec2.autowiredEnabled": {
+			"name": "camel.component.aws-ec2.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-ec2-kafka-connector/src/main/docs/camel-aws-ec2-kafka-sink-connector.adoc b/connectors/camel-aws-ec2-kafka-connector/src/main/docs/camel-aws-ec2-kafka-sink-connector.adoc
index 30f31e8..6e2d8b9 100644
--- a/connectors/camel-aws-ec2-kafka-connector/src/main/docs/camel-aws-ec2-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-ec2-kafka-connector/src/main/docs/camel-aws-ec2-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsec2.CamelAwsec2SinkConnector
 ----
 
 
-The camel-aws-ec2 sink connector supports 25 options, which are listed below.
+The camel-aws-ec2 sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-ec2 sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the EC2 client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which ECS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-ec2.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-ec2.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-ec2 sink connector supports 25 options, which are listed below.
 | *camel.component.aws-ec2.proxyProtocol* | To define a proxy protocol when instantiating the EC2 client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-ec2.region* | The region in which ECS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | null | false | MEDIUM
 | *camel.component.aws-ec2.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-ec2.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-ec2.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnectorConfig.java b/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnectorConfig.java
index e945b08..8645b11 100644
--- a/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnectorConfig.java
+++ b/connectors/camel-aws-ec2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsec2/CamelAwsec2SinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwsec2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSEC2_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSEC2_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSEC2_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSEC2_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSEC2_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwsec2SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-ec2.secretKey";
     public static final String CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-ec2.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSEC2_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSEC2_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSEC2_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-ec2.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSEC2_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSEC2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwsec2SinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwsec2SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSEC2_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSEC2_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSEC2_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwsec2SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSEC2_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEC2_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSEC2_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSEC2_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEC2_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEC2_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ecs-kafka-connector/src/generated/resources/camel-aws-ecs-sink.json b/connectors/camel-aws-ecs-kafka-connector/src/generated/resources/camel-aws-ecs-sink.json
index b8386f7..aeaca5c 100644
--- a/connectors/camel-aws-ecs-kafka-connector/src/generated/resources/camel-aws-ecs-sink.json
+++ b/connectors/camel-aws-ecs-kafka-connector/src/generated/resources/camel-aws-ecs-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ecs.basicPropertyBinding": {
-			"name": "camel.component.aws-ecs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ecs.autowiredEnabled": {
+			"name": "camel.component.aws-ecs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-ecs-kafka-connector/src/main/docs/camel-aws-ecs-kafka-sink-connector.adoc b/connectors/camel-aws-ecs-kafka-connector/src/main/docs/camel-aws-ecs-kafka-sink-connector.adoc
index 9a11441..3e6b4e7 100644
--- a/connectors/camel-aws-ecs-kafka-connector/src/main/docs/camel-aws-ecs-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-ecs-kafka-connector/src/main/docs/camel-aws-ecs-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsecs.CamelAwsecsSinkConnector
 ----
 
 
-The camel-aws-ecs sink connector supports 25 options, which are listed below.
+The camel-aws-ecs sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-ecs sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which ECS client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-ecs.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-ecs.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-ecs sink connector supports 25 options, which are listed below.
 | *camel.component.aws-ecs.proxyProtocol* | To define a proxy protocol when instantiating the ECS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-ecs.region* | The region in which ECS client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-ecs.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-ecs.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-ecs.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnectorConfig.java b/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnectorConfig.java
index 09ee749..b4e0b07 100644
--- a/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnectorConfig.java
+++ b/connectors/camel-aws-ecs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsecs/CamelAwsecsSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwsecsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSECS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSECS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSECS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSECS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSECS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwsecsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-ecs.secretKey";
     public static final String CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-ecs.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSECS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSECS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSECS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-ecs.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSECS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSECS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwsecsSinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwsecsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSECS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSECS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSECS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSECS_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSECS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwsecsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSECS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSECS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSECS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSECS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSECS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSECS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSECS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-eks-kafka-connector/src/generated/resources/camel-aws-eks-sink.json b/connectors/camel-aws-eks-kafka-connector/src/generated/resources/camel-aws-eks-sink.json
index e75535d..13c143a 100644
--- a/connectors/camel-aws-eks-kafka-connector/src/generated/resources/camel-aws-eks-sink.json
+++ b/connectors/camel-aws-eks-kafka-connector/src/generated/resources/camel-aws-eks-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-eks.basicPropertyBinding": {
-			"name": "camel.component.aws-eks.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-eks.autowiredEnabled": {
+			"name": "camel.component.aws-eks.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-eks-kafka-connector/src/main/docs/camel-aws-eks-kafka-sink-connector.adoc b/connectors/camel-aws-eks-kafka-connector/src/main/docs/camel-aws-eks-kafka-sink-connector.adoc
index e8bf0be..edb22be 100644
--- a/connectors/camel-aws-eks-kafka-connector/src/main/docs/camel-aws-eks-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-eks-kafka-connector/src/main/docs/camel-aws-eks-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awseks.CamelAwseksSinkConnector
 ----
 
 
-The camel-aws-eks sink connector supports 25 options, which are listed below.
+The camel-aws-eks sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-eks sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which EKS client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-eks.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-eks.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-eks sink connector supports 25 options, which are listed below.
 | *camel.component.aws-eks.proxyProtocol* | To define a proxy protocol when instantiating the EKS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-eks.region* | The region in which EKS client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-eks.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-eks.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-eks.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnectorConfig.java b/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnectorConfig.java
index 0a59481..f59fe3c 100644
--- a/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnectorConfig.java
+++ b/connectors/camel-aws-eks-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awseks/CamelAwseksSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwseksSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSEKS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSEKS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSEKS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSEKS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSEKS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwseksSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-eks.secretKey";
     public static final String CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-eks.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSEKS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSEKS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSEKS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-eks.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSEKS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSEKS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwseksSinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwseksSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSEKS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSEKS_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSEKS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwseksSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSEKS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSEKS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSEKS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSEKS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSEKS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSEKS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-iam-kafka-connector/src/generated/resources/camel-aws-iam-sink.json b/connectors/camel-aws-iam-kafka-connector/src/generated/resources/camel-aws-iam-sink.json
index 4e31313..5142ace 100644
--- a/connectors/camel-aws-iam-kafka-connector/src/generated/resources/camel-aws-iam-sink.json
+++ b/connectors/camel-aws-iam-kafka-connector/src/generated/resources/camel-aws-iam-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-iam.basicPropertyBinding": {
-			"name": "camel.component.aws-iam.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-iam.autowiredEnabled": {
+			"name": "camel.component.aws-iam.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-iam-kafka-connector/src/main/docs/camel-aws-iam-kafka-sink-connector.adoc b/connectors/camel-aws-iam-kafka-connector/src/main/docs/camel-aws-iam-kafka-sink-connector.adoc
index 2f21206..3bec2dd 100644
--- a/connectors/camel-aws-iam-kafka-connector/src/main/docs/camel-aws-iam-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-iam-kafka-connector/src/main/docs/camel-aws-iam-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsiam.CamelAwsiamSinkConnector
 ----
 
 
-The camel-aws-iam sink connector supports 25 options, which are listed below.
+The camel-aws-iam sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-iam sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which IAM client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-iam.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-iam.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-iam sink connector supports 25 options, which are listed below.
 | *camel.component.aws-iam.proxyProtocol* | To define a proxy protocol when instantiating the IAM client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-iam.region* | The region in which IAM client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-iam.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-iam.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-iam.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnectorConfig.java b/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnectorConfig.java
index 725cb28..aba565f 100644
--- a/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnectorConfig.java
+++ b/connectors/camel-aws-iam-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsiam/CamelAwsiamSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwsiamSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSIAM_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSIAM_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSIAM_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSIAM_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSIAM_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwsiamSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-iam.secretKey";
     public static final String CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-iam.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSIAM_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSIAM_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSIAM_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-iam.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSIAM_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSIAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwsiamSinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwsiamSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSIAM_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSIAM_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSIAM_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwsiamSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSIAM_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSIAM_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSIAM_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSIAM_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSIAM_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSIAM_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink.json b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink.json
index b6ca7a8..9f4cb23 100644
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink.json
+++ b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/generated/resources/camel-aws-kinesis-firehose-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,11 +130,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kinesis-firehose.basicPropertyBinding": {
-			"name": "camel.component.aws-kinesis-firehose.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kinesis-firehose.autowiredEnabled": {
+			"name": "camel.component.aws-kinesis-firehose.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-kinesis-firehose.accessKey": {
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/camel-aws-kinesis-firehose-kafka-sink-connector.adoc b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/camel-aws-kinesis-firehose-kafka-sink-connector.adoc
index e378053..c6202d8 100644
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/camel-aws-kinesis-firehose-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/docs/camel-aws-kinesis-firehose-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awskinesisfirehose.CamelAwskines
 ----
 
 
-The camel-aws-kinesis-firehose sink connector supports 23 options, which are listed below.
+The camel-aws-kinesis-firehose sink connector supports 22 options, which are listed below.
 
 
 
@@ -37,7 +37,6 @@ The camel-aws-kinesis-firehose sink connector supports 23 options, which are lis
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Kinesis Firehose client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the Kinesis Firehose client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which Kinesis client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -49,7 +48,7 @@ The camel-aws-kinesis-firehose sink connector supports 23 options, which are lis
 | *camel.component.aws-kinesis-firehose.proxyPort* | To define a proxy port when instantiating the Kinesis Firehose client | null | false | MEDIUM
 | *camel.component.aws-kinesis-firehose.proxyProtocol* | To define a proxy protocol when instantiating the Kinesis Firehose client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-kinesis-firehose.region* | The region in which Kinesis client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
-| *camel.component.aws-kinesis-firehose.basicProperty Binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-kinesis-firehose.autowired Enabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-kinesis-firehose.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-kinesis-firehose.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnectorConfig.java b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnectorConfig.java
index f88b76c..aa4d40a 100644
--- a/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnectorConfig.java
+++ b/connectors/camel-aws-kinesis-firehose-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesisfirehose/CamelAwskinesisfirehoseSinkConnectorConfig.java
@@ -50,9 +50,6 @@ public class CamelAwskinesisfirehoseSinkConnectorConfig
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_REGION_CONF = "camel.sink.endpoint.region";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_REGION_DOC = "The region in which Kinesis client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)You'll need to use the name Regions.EU_WEST_1.name()";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_REGION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -86,9 +83,9 @@ public class CamelAwskinesisfirehoseSinkConnectorConfig
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_REGION_CONF = "camel.component.aws-kinesis-firehose.region";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_REGION_DOC = "The region in which Kinesis client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)You'll need to use the name Regions.EU_WEST_1.name()";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_REGION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-kinesis-firehose.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-kinesis-firehose.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-kinesis-firehose.accessKey";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -117,7 +114,6 @@ public class CamelAwskinesisfirehoseSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_REGION_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_ENDPOINT_SECRET_KEY_DOC);
@@ -129,7 +125,7 @@ public class CamelAwskinesisfirehoseSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_REGION_DOC);
-        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESISFIREHOSE_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-sink.json b/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-sink.json
index 15df906..48e1f19 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-sink.json
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-sink.json
@@ -60,13 +60,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,11 +130,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kinesis.basicPropertyBinding": {
-			"name": "camel.component.aws-kinesis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kinesis.autowiredEnabled": {
+			"name": "camel.component.aws-kinesis.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-kinesis.accessKey": {
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-source.json b/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-source.json
index 25b1050..2d6e9a0 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-source.json
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/generated/resources/camel-aws-kinesis-source.json
@@ -118,13 +118,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -321,11 +314,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kinesis.basicPropertyBinding": {
-			"name": "camel.component.aws-kinesis.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kinesis.autowiredEnabled": {
+			"name": "camel.component.aws-kinesis.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-kinesis.accessKey": {
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-sink-connector.adoc b/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-sink-connector.adoc
index eca3ca8..03ca760 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSinkCo
 ----
 
 
-The camel-aws-kinesis sink connector supports 23 options, which are listed below.
+The camel-aws-kinesis sink connector supports 22 options, which are listed below.
 
 
 
@@ -37,7 +37,6 @@ The camel-aws-kinesis sink connector supports 23 options, which are listed below
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the Kinesis client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which Kinesis client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -49,7 +48,7 @@ The camel-aws-kinesis sink connector supports 23 options, which are listed below
 | *camel.component.aws-kinesis.proxyProtocol* | To define a proxy protocol when instantiating the Kinesis client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-kinesis.region* | The region in which Kinesis client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1)You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-kinesis.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed  [...]
-| *camel.component.aws-kinesis.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-kinesis.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-kinesis.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-kinesis.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-source-connector.adoc b/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-source-connector.adoc
index 2b059d0..f6874df 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-source-connector.adoc
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/main/docs/camel-aws-kinesis-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awskinesis.CamelAwskinesisSource
 ----
 
 
-The camel-aws-kinesis source connector supports 51 options, which are listed below.
+The camel-aws-kinesis source connector supports 50 options, which are listed below.
 
 
 
@@ -46,7 +46,6 @@ The camel-aws-kinesis source connector supports 51 options, which are listed bel
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.backoffErrorThreshold* | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
 | *camel.source.endpoint.backoffIdleThreshold* | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
@@ -77,7 +76,7 @@ The camel-aws-kinesis source connector supports 51 options, which are listed bel
 | *camel.component.aws-kinesis.sequenceNumber* | The sequence number to start polling from. Required if iteratorType is set to AFTER_SEQUENCE_NUMBER or AT_SEQUENCE_NUMBER | null | false | MEDIUM
 | *camel.component.aws-kinesis.shardClosed* | Define what will be the behavior in case of shard closed. Possible value are ignore, silent and fail. In case of ignore a message will be logged and the consumer will restart from the beginning,in case of silent there will be no logging and the consumer will start from the beginning,in case of fail a ReachedClosedStateException will be raised One of: [ignore] [fail] [silent] | "ignore" | false | MEDIUM
 | *camel.component.aws-kinesis.shardId* | Defines which shardId in the Kinesis stream to get records from | null | false | MEDIUM
-| *camel.component.aws-kinesis.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-kinesis.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-kinesis.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-kinesis.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnectorConfig.java b/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnectorConfig.java
index 5b003cb..f52910e 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnectorConfig.java
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSinkConnectorConfig.java
@@ -50,9 +50,6 @@ public class CamelAwskinesisSinkConnectorConfig
     public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that [...]
     public static final Boolean CAMEL_SINK_AWSKINESIS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -86,9 +83,9 @@ public class CamelAwskinesisSinkConnectorConfig
     public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws-kinesis.lazyStartProducer";
     public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware tha [...]
     public static final Boolean CAMEL_SINK_AWSKINESIS_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-kinesis.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-kinesis.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-kinesis.accessKey";
     public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSKINESIS_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -116,7 +113,6 @@ public class CamelAwskinesisSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_ENDPOINT_SECRET_KEY_DOC);
@@ -128,7 +124,7 @@ public class CamelAwskinesisSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSKINESIS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKINESIS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKINESIS_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnectorConfig.java b/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnectorConfig.java
index 2bc9dc1..a21e58f 100644
--- a/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnectorConfig.java
+++ b/connectors/camel-aws-kinesis-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskinesis/CamelAwskinesisSourceConnectorConfig.java
@@ -77,9 +77,6 @@ public class CamelAwskinesisSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_POLL_STRATEGY_CONF = "camel.source.endpoint.pollStrategy";
     public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_POLL_STRATEGY_DOC = "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.";
     public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_POLL_STRATEGY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -170,9 +167,9 @@ public class CamelAwskinesisSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_ID_CONF = "camel.component.aws-kinesis.shardId";
     public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_ID_DOC = "Defines which shardId in the Kinesis stream to get records from";
     public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_ID_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-kinesis.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-kinesis.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-kinesis.accessKey";
     public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SOURCE_AWSKINESIS_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -209,7 +206,6 @@ public class CamelAwskinesisSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_POLL_STRATEGY_DOC);
-        conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC);
@@ -240,7 +236,7 @@ public class CamelAwskinesisSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_SEQUENCE_NUMBER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SEQUENCE_NUMBER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SEQUENCE_NUMBER_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_CLOSED_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_CLOSED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_CLOSED_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_ID_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_ID_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SHARD_ID_DOC);
-        conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AWSKINESIS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWSKINESIS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSKINESIS_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-kms-kafka-connector/src/generated/resources/camel-aws-kms-sink.json b/connectors/camel-aws-kms-kafka-connector/src/generated/resources/camel-aws-kms-sink.json
index c9cd26c..221f341 100644
--- a/connectors/camel-aws-kms-kafka-connector/src/generated/resources/camel-aws-kms-sink.json
+++ b/connectors/camel-aws-kms-kafka-connector/src/generated/resources/camel-aws-kms-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-kms.basicPropertyBinding": {
-			"name": "camel.component.aws-kms.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-kms.autowiredEnabled": {
+			"name": "camel.component.aws-kms.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-kms-kafka-connector/src/main/docs/camel-aws-kms-kafka-sink-connector.adoc b/connectors/camel-aws-kms-kafka-connector/src/main/docs/camel-aws-kms-kafka-sink-connector.adoc
index 623b201..097776c 100644
--- a/connectors/camel-aws-kms-kafka-connector/src/main/docs/camel-aws-kms-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-kms-kafka-connector/src/main/docs/camel-aws-kms-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awskms.CamelAwskmsSinkConnector
 ----
 
 
-The camel-aws-kms sink connector supports 25 options, which are listed below.
+The camel-aws-kms sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-kms sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the KMS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which KMS client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-kms.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-kms.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-kms sink connector supports 25 options, which are listed below.
 | *camel.component.aws-kms.proxyProtocol* | To define a proxy protocol when instantiating the KMS client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-kms.region* | The region in which KMS client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-kms.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-kms.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-kms.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskms/CamelAwskmsSinkConnectorConfig.java b/connectors/camel-aws-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskms/CamelAwskmsSinkConnectorConfig.java
index dc007d8..bd1e49b 100644
--- a/connectors/camel-aws-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskms/CamelAwskmsSinkConnectorConfig.java
+++ b/connectors/camel-aws-kms-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awskms/CamelAwskmsSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwskmsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSKMS_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSKMS_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSKMS_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKMS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSKMS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSKMS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSKMS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSKMS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSKMS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwskmsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSKMS_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-kms.secretKey";
     public static final String CAMEL_SINK_AWSKMS_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSKMS_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSKMS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-kms.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSKMS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSKMS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSKMS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-kms.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSKMS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSKMS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwskmsSinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwskmsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSKMS_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSKMS_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSKMS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSKMS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKMS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSKMS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKMS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSKMS_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKMS_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSKMS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwskmsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSKMS_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSKMS_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSKMS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSKMS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSKMS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKMS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSKMS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSKMS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSKMS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSKMS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-sink.json b/connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-sink.json
index 7531787..6aa4ab4 100644
--- a/connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-sink.json
+++ b/connectors/camel-aws-lambda-kafka-connector/src/generated/resources/camel-aws-lambda-sink.json
@@ -48,13 +48,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -126,19 +119,19 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
+		"camel.component.aws-lambda.autowiredEnabled": {
+			"name": "camel.component.aws-lambda.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
+			"required": "false"
+		},
 		"camel.component.aws-lambda.awsLambdaClient": {
 			"name": "camel.component.aws-lambda.awsLambdaClient",
 			"description": "To use a existing configured AwsLambdaClient as client",
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-lambda.basicPropertyBinding": {
-			"name": "camel.component.aws-lambda.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
-			"required": "false"
-		},
 		"camel.component.aws-lambda.proxyHost": {
 			"name": "camel.component.aws-lambda.proxyHost",
 			"description": "To define a proxy host when instantiating the Lambda client",
diff --git a/connectors/camel-aws-lambda-kafka-connector/src/main/docs/camel-aws-lambda-kafka-sink-connector.adoc b/connectors/camel-aws-lambda-kafka-connector/src/main/docs/camel-aws-lambda-kafka-sink-connector.adoc
index cad5132..ffe83e4 100644
--- a/connectors/camel-aws-lambda-kafka-connector/src/main/docs/camel-aws-lambda-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-lambda-kafka-connector/src/main/docs/camel-aws-lambda-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awslambda.CamelAwslambdaSinkConn
 ----
 
 
-The camel-aws-lambda sink connector supports 25 options, which are listed below.
+The camel-aws-lambda sink connector supports 24 options, which are listed below.
 
 
 
@@ -35,7 +35,6 @@ The camel-aws-lambda sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.operation* | The operation to perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction One of: [listFunctions] [getFunction] [createAlias] [deleteAlias] [getAlias] [listAliases] [createFunction] [deleteFunction] [invokeFunction] [updateFunction] [createEventSourceMapping] [deleteEventSourceMapping] [listEventSourceMapping] [listTags] [tagResource] [untagResource] [publishVersion] [listVersions] | "invokeFunction" | false | MEDIUM
 | *camel.sink.endpoint.region* | Amazon AWS Region. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.awsLambdaClient* | To use a existing configured AwsLambdaClient as client | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the Lambda client | null | false | MEDIUM
 | *camel.sink.endpoint.proxyPort* | To define a proxy port when instantiating the Lambda client | null | false | MEDIUM
@@ -47,8 +46,8 @@ The camel-aws-lambda sink connector supports 25 options, which are listed below.
 | *camel.component.aws-lambda.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...]
 | *camel.component.aws-lambda.operation* | The operation to perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction One of: [listFunctions] [getFunction] [createAlias] [deleteAlias] [getAlias] [listAliases] [createFunction] [deleteFunction] [invokeFunction] [updateFunction] [createEventSourceMapping] [deleteEventSourceMapping] [listEventSourceMapping] [listTags] [tagResource] [untagResource] [publishVersion] [listVersions] | "invokeFunction" | fals [...]
 | *camel.component.aws-lambda.region* | Amazon AWS Region. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
+| *camel.component.aws-lambda.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-lambda.awsLambdaClient* | To use a existing configured AwsLambdaClient as client | null | false | MEDIUM
-| *camel.component.aws-lambda.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
 | *camel.component.aws-lambda.proxyHost* | To define a proxy host when instantiating the Lambda client | null | false | MEDIUM
 | *camel.component.aws-lambda.proxyPort* | To define a proxy port when instantiating the Lambda client | null | false | MEDIUM
 | *camel.component.aws-lambda.proxyProtocol* | To define a proxy protocol when instantiating the Lambda client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
diff --git a/connectors/camel-aws-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambda/CamelAwslambdaSinkConnectorConfig.java b/connectors/camel-aws-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambda/CamelAwslambdaSinkConnectorConfig.java
index 820e9b3..858e863 100644
--- a/connectors/camel-aws-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambda/CamelAwslambdaSinkConnectorConfig.java
+++ b/connectors/camel-aws-lambda-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awslambda/CamelAwslambdaSinkConnectorConfig.java
@@ -44,9 +44,6 @@ public class CamelAwslambdaSinkConnectorConfig
     public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_CONF = "camel.sink.endpoint.awsLambdaClient";
     public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DOC = "To use a existing configured AwsLambdaClient as client";
     public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSLAMBDA_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSLAMBDA_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSLAMBDA_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -80,12 +77,12 @@ public class CamelAwslambdaSinkConnectorConfig
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_REGION_CONF = "camel.component.aws-lambda.region";
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_REGION_DOC = "Amazon AWS Region. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name()";
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_REGION_DEFAULT = null;
+    public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-lambda.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSLAMBDA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_CONF = "camel.component.aws-lambda.awsLambdaClient";
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_DOC = "To use a existing configured AwsLambdaClient as client";
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-lambda.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSLAMBDA_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_HOST_CONF = "camel.component.aws-lambda.proxyHost";
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_HOST_DOC = "To define a proxy host when instantiating the Lambda client";
     public static final String CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_HOST_DEFAULT = null;
@@ -120,7 +117,6 @@ public class CamelAwslambdaSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_OPERATION_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_AWS_LAMBDA_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSLAMBDA_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSLAMBDA_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_ENDPOINT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_ENDPOINT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_ENDPOINT_PROXY_PORT_DOC);
@@ -132,8 +128,8 @@ public class CamelAwslambdaSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSLAMBDA_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_OPERATION_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_REGION_DOC);
+        conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSLAMBDA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_AWS_LAMBDA_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSLAMBDA_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSLAMBDA_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_HOST_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_PORT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_PORT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_PORT_DOC);
         conf.define(CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSLAMBDA_COMPONENT_PROXY_PROTOCOL_DOC);
diff --git a/connectors/camel-aws-mq-kafka-connector/src/generated/resources/camel-aws-mq-sink.json b/connectors/camel-aws-mq-kafka-connector/src/generated/resources/camel-aws-mq-sink.json
index 4791c5a..e800afa 100644
--- a/connectors/camel-aws-mq-kafka-connector/src/generated/resources/camel-aws-mq-sink.json
+++ b/connectors/camel-aws-mq-kafka-connector/src/generated/resources/camel-aws-mq-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-mq.basicPropertyBinding": {
-			"name": "camel.component.aws-mq.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-mq.autowiredEnabled": {
+			"name": "camel.component.aws-mq.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-mq-kafka-connector/src/main/docs/camel-aws-mq-kafka-sink-connector.adoc b/connectors/camel-aws-mq-kafka-connector/src/main/docs/camel-aws-mq-kafka-sink-connector.adoc
index 9e05c60..ad39f99 100644
--- a/connectors/camel-aws-mq-kafka-connector/src/main/docs/camel-aws-mq-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-mq-kafka-connector/src/main/docs/camel-aws-mq-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsmq.CamelAwsmqSinkConnector
 ----
 
 
-The camel-aws-mq sink connector supports 25 options, which are listed below.
+The camel-aws-mq sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-mq sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the MQ client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which MQ client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-mq.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-mq.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-mq sink connector supports 25 options, which are listed below.
 | *camel.component.aws-mq.proxyProtocol* | To define a proxy protocol when instantiating the MQ client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-mq.region* | The region in which MQ client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-mq.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-mq.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-mq.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmq/CamelAwsmqSinkConnectorConfig.java b/connectors/camel-aws-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmq/CamelAwsmqSinkConnectorConfig.java
index 6aefaa1..14f1e22 100644
--- a/connectors/camel-aws-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmq/CamelAwsmqSinkConnectorConfig.java
+++ b/connectors/camel-aws-mq-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmq/CamelAwsmqSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwsmqSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSMQ_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSMQ_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSMQ_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSMQ_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSMQ_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSMQ_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSMQ_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwsmqSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSMQ_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-mq.secretKey";
     public static final String CAMEL_SINK_AWSMQ_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSMQ_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSMQ_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-mq.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSMQ_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSMQ_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSMQ_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-mq.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSMQ_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwsmqSinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwsmqSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSMQ_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSMQ_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSMQ_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSMQ_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSMQ_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMQ_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSMQ_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMQ_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSMQ_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwsmqSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSMQ_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSMQ_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSMQ_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMQ_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSMQ_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMQ_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSMQ_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSMQ_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMQ_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMQ_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-msk-kafka-connector/src/generated/resources/camel-aws-msk-sink.json b/connectors/camel-aws-msk-kafka-connector/src/generated/resources/camel-aws-msk-sink.json
index b82d2de..be4d8c2 100644
--- a/connectors/camel-aws-msk-kafka-connector/src/generated/resources/camel-aws-msk-sink.json
+++ b/connectors/camel-aws-msk-kafka-connector/src/generated/resources/camel-aws-msk-sink.json
@@ -78,13 +78,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -161,11 +154,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-msk.basicPropertyBinding": {
-			"name": "camel.component.aws-msk.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-msk.autowiredEnabled": {
+			"name": "camel.component.aws-msk.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-msk-kafka-connector/src/main/docs/camel-aws-msk-kafka-sink-connector.adoc b/connectors/camel-aws-msk-kafka-connector/src/main/docs/camel-aws-msk-kafka-sink-connector.adoc
index ab3a76d..fd80b8b 100644
--- a/connectors/camel-aws-msk-kafka-connector/src/main/docs/camel-aws-msk-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-msk-kafka-connector/src/main/docs/camel-aws-msk-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsmsk.CamelAwsmskSinkConnector
 ----
 
 
-The camel-aws-msk sink connector supports 25 options, which are listed below.
+The camel-aws-msk sink connector supports 24 options, which are listed below.
 
 
 
@@ -40,7 +40,6 @@ The camel-aws-msk sink connector supports 25 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the MSK client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which MSK client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-msk.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-msk.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -53,7 +52,7 @@ The camel-aws-msk sink connector supports 25 options, which are listed below.
 | *camel.component.aws-msk.proxyProtocol* | To define a proxy protocol when instantiating the MSK client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.component.aws-msk.region* | The region in which MSK client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.component.aws-msk.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.component.aws-msk.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-msk.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmsk/CamelAwsmskSinkConnectorConfig.java b/connectors/camel-aws-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmsk/CamelAwsmskSinkConnectorConfig.java
index 8b805b0..b20f9ad 100644
--- a/connectors/camel-aws-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmsk/CamelAwsmskSinkConnectorConfig.java
+++ b/connectors/camel-aws-msk-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsmsk/CamelAwsmskSinkConnectorConfig.java
@@ -57,9 +57,6 @@ public class CamelAwsmskSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSMSK_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSMSK_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSMSK_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSMSK_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSMSK_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSMSK_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSMSK_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSMSK_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSMSK_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -96,9 +93,9 @@ public class CamelAwsmskSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSMSK_COMPONENT_SECRET_KEY_CONF = "camel.component.aws-msk.secretKey";
     public static final String CAMEL_SINK_AWSMSK_COMPONENT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSMSK_COMPONENT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSMSK_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-msk.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSMSK_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSMSK_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSMSK_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-msk.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSMSK_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSMSK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwsmskSinkConnectorConfig(
             ConfigDef config,
@@ -123,7 +120,6 @@ public class CamelAwsmskSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSMSK_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSMSK_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSMSK_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSMSK_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMSK_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSMSK_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMSK_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSMSK_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMSK_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSMSK_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_COMPONENT_ACCESS_KEY_DOC);
@@ -136,7 +132,7 @@ public class CamelAwsmskSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSMSK_COMPONENT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_COMPONENT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_COMPONENT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSMSK_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSMSK_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSMSK_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_COMPONENT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSMSK_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMSK_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSMSK_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSMSK_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSMSK_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSMSK_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-sink.json b/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-sink.json
index e4dcdbf..493c281 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-sink.json
+++ b/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-sink.json
@@ -199,13 +199,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -415,11 +408,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-s3.basicPropertyBinding": {
-			"name": "camel.component.aws-s3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-s3.autowiredEnabled": {
+			"name": "camel.component.aws-s3.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-s3.accessKey": {
diff --git a/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-source.json b/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-source.json
index 7a17688..4fb886c 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-source.json
+++ b/connectors/camel-aws-s3-kafka-connector/src/generated/resources/camel-aws-s3-source.json
@@ -219,13 +219,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -509,11 +502,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-s3.basicPropertyBinding": {
-			"name": "camel.component.aws-s3.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-s3.autowiredEnabled": {
+			"name": "camel.component.aws-s3.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-s3.accessKey": {
diff --git a/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-sink-connector.adoc b/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-sink-connector.adoc
index 946275d..3ccb096 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awss3.CamelAwss3SinkConnector
 ----
 
 
-The camel-aws-s3 sink connector supports 65 options, which are listed below.
+The camel-aws-s3 sink connector supports 64 options, which are listed below.
 
 
 
@@ -58,7 +58,6 @@ The camel-aws-s3 sink connector supports 65 options, which are listed below.
 | *camel.sink.endpoint.dualstackEnabled* | Define if Dualstack enabled is true or false | false | false | MEDIUM
 | *camel.sink.endpoint.forceGlobalBucketAccessEnabled* | Define if Force Global Bucket Access enabled is true or false | false | false | MEDIUM
 | *camel.sink.endpoint.payloadSigningEnabled* | Define if Payload Signing enabled is true or false | false | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -91,7 +90,7 @@ The camel-aws-s3 sink connector supports 65 options, which are listed below.
 | *camel.component.aws-s3.dualstackEnabled* | Define if Dualstack enabled is true or false | false | false | MEDIUM
 | *camel.component.aws-s3.forceGlobalBucketAccess Enabled* | Define if Force Global Bucket Access enabled is true or false | false | false | MEDIUM
 | *camel.component.aws-s3.payloadSigningEnabled* | Define if Payload Signing enabled is true or false | false | false | MEDIUM
-| *camel.component.aws-s3.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-s3.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-s3.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-s3.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-source-connector.adoc b/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-source-connector.adoc
index adfff28..10ddc3b 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-source-connector.adoc
+++ b/connectors/camel-aws-s3-kafka-connector/src/main/docs/camel-aws-s3-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awss3.CamelAwss3SourceConnector
 ----
 
 
-The camel-aws-s3 source connector supports 79 options, which are listed below.
+The camel-aws-s3 source connector supports 78 options, which are listed below.
 
 
 
@@ -61,7 +61,6 @@ The camel-aws-s3 source connector supports 79 options, which are listed below.
 | *camel.source.endpoint.dualstackEnabled* | Define if Dualstack enabled is true or false | false | false | MEDIUM
 | *camel.source.endpoint.forceGlobalBucketAccess Enabled* | Define if Force Global Bucket Access enabled is true or false | false | false | MEDIUM
 | *camel.source.endpoint.payloadSigningEnabled* | Define if Payload Signing enabled is true or false | false | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.backoffErrorThreshold* | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
 | *camel.source.endpoint.backoffIdleThreshold* | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
@@ -105,7 +104,7 @@ The camel-aws-s3 source connector supports 79 options, which are listed below.
 | *camel.component.aws-s3.dualstackEnabled* | Define if Dualstack enabled is true or false | false | false | MEDIUM
 | *camel.component.aws-s3.forceGlobalBucketAccess Enabled* | Define if Force Global Bucket Access enabled is true or false | false | false | MEDIUM
 | *camel.component.aws-s3.payloadSigningEnabled* | Define if Payload Signing enabled is true or false | false | false | MEDIUM
-| *camel.component.aws-s3.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-s3.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-s3.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-s3.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SinkConnectorConfig.java b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SinkConnectorConfig.java
index 1e03f9b..c21ab98 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SinkConnectorConfig.java
+++ b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SinkConnectorConfig.java
@@ -111,9 +111,6 @@ public class CamelAwss3SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_CONF = "camel.sink.endpoint.payloadSigningEnabled";
     public static final String CAMEL_SINK_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DOC = "Define if Payload Signing enabled is true or false";
     public static final Boolean CAMEL_SINK_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSS3_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSS3_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSS3_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -210,9 +207,9 @@ public class CamelAwss3SinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_CONF = "camel.component.aws-s3.payloadSigningEnabled";
     public static final String CAMEL_SINK_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DOC = "Define if Payload Signing enabled is true or false";
     public static final Boolean CAMEL_SINK_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-s3.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSS3_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-s3.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSS3_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-s3.accessKey";
     public static final String CAMEL_SINK_AWSS3_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSS3_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -261,7 +258,6 @@ public class CamelAwss3SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSS3_ENDPOINT_DUALSTACK_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_ENDPOINT_DUALSTACK_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_DUALSTACK_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSS3_ENDPOINT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_ENDPOINT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DOC);
-        conf.define(CAMEL_SINK_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSS3_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSS3_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSS3_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_ENDPOINT_SECRET_KEY_DOC);
@@ -294,7 +290,7 @@ public class CamelAwss3SinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSS3_COMPONENT_DUALSTACK_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_COMPONENT_DUALSTACK_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_COMPONENT_DUALSTACK_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSS3_COMPONENT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_COMPONENT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_COMPONENT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DOC);
-        conf.define(CAMEL_SINK_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSS3_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSS3_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSS3_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSS3_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSS3_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SourceConnectorConfig.java b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SourceConnectorConfig.java
index b4c2041..5a42726 100644
--- a/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SourceConnectorConfig.java
+++ b/connectors/camel-aws-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awss3/CamelAwss3SourceConnectorConfig.java
@@ -122,9 +122,6 @@ public class CamelAwss3SourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_CONF = "camel.source.endpoint.payloadSigningEnabled";
     public static final String CAMEL_SOURCE_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DOC = "Define if Payload Signing enabled is true or false";
     public static final Boolean CAMEL_SOURCE_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWSS3_ENDPOINT_SYNCHRONOUS_CONF = "camel.source.endpoint.synchronous";
     public static final String CAMEL_SOURCE_AWSS3_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SOURCE_AWSS3_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -254,9 +251,9 @@ public class CamelAwss3SourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_CONF = "camel.component.aws-s3.payloadSigningEnabled";
     public static final String CAMEL_SOURCE_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DOC = "Define if Payload Signing enabled is true or false";
     public static final Boolean CAMEL_SOURCE_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DEFAULT = false;
-    public static final String CAMEL_SOURCE_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-s3.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSS3_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-s3.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWSS3_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-s3.accessKey";
     public static final String CAMEL_SOURCE_AWSS3_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SOURCE_AWSS3_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -308,7 +305,6 @@ public class CamelAwss3SourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_DUALSTACK_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_ENDPOINT_DUALSTACK_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_DUALSTACK_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_ENDPOINT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_PAYLOAD_SIGNING_ENABLED_DOC);
-        conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_BACKOFF_ERROR_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSS3_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_BACKOFF_ERROR_THRESHOLD_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_ENDPOINT_BACKOFF_IDLE_THRESHOLD_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSS3_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_ENDPOINT_BACKOFF_IDLE_THRESHOLD_DOC);
@@ -352,7 +348,7 @@ public class CamelAwss3SourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_DUALSTACK_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_COMPONENT_DUALSTACK_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_COMPONENT_DUALSTACK_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_COMPONENT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_COMPONENT_FORCE_GLOBAL_BUCKET_ACCESS_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_COMPONENT_PAYLOAD_SIGNING_ENABLED_DOC);
-        conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AWSS3_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSS3_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SOURCE_AWSS3_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSS3_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSS3_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-sink.json b/connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-sink.json
index 0e037a9..1fd578d 100644
--- a/connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-sink.json
+++ b/connectors/camel-aws-sdb-kafka-connector/src/generated/resources/camel-aws-sdb-sink.json
@@ -85,13 +85,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -106,11 +99,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sdb.basicPropertyBinding": {
-			"name": "camel.component.aws-sdb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sdb.autowiredEnabled": {
+			"name": "camel.component.aws-sdb.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-sdb-kafka-connector/src/main/docs/camel-aws-sdb-kafka-sink-connector.adoc b/connectors/camel-aws-sdb-kafka-connector/src/main/docs/camel-aws-sdb-kafka-sink-connector.adoc
index f50fad6..2b7c800 100644
--- a/connectors/camel-aws-sdb-kafka-connector/src/main/docs/camel-aws-sdb-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-sdb-kafka-connector/src/main/docs/camel-aws-sdb-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awssdb.CamelAwssdbSinkConnector
 ----
 
 
-The camel-aws-sdb sink connector supports 16 options, which are listed below.
+The camel-aws-sdb sink connector supports 15 options, which are listed below.
 
 
 
@@ -41,10 +41,9 @@ The camel-aws-sdb sink connector supports 16 options, which are listed below.
 | *camel.sink.endpoint.proxyProtocol* | To define a proxy protocol when instantiating the SDB client One of: [HTTP] [HTTPS] | "HTTPS" | false | MEDIUM
 | *camel.sink.endpoint.region* | The region in which SDB client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-sdb.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...]
-| *camel.component.aws-sdb.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-sdb.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-sdb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssdb/CamelAwssdbSinkConnectorConfig.java b/connectors/camel-aws-sdb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssdb/CamelAwssdbSinkConnectorConfig.java
index 797784d..7f40308 100644
--- a/connectors/camel-aws-sdb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssdb/CamelAwssdbSinkConnectorConfig.java
+++ b/connectors/camel-aws-sdb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssdb/CamelAwssdbSinkConnectorConfig.java
@@ -60,18 +60,15 @@ public class CamelAwssdbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSDB_ENDPOINT_SECRET_KEY_CONF = "camel.sink.endpoint.secretKey";
     public static final String CAMEL_SINK_AWSSDB_ENDPOINT_SECRET_KEY_DOC = "Amazon AWS Secret Key";
     public static final String CAMEL_SINK_AWSSDB_ENDPOINT_SECRET_KEY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSDB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSDB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSDB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSDB_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSSDB_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSSDB_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSDB_COMPONENT_LAZY_START_PRODUCER_CONF = "camel.component.aws-sdb.lazyStartProducer";
     public static final String CAMEL_SINK_AWSSDB_COMPONENT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that wh [...]
     public static final Boolean CAMEL_SINK_AWSSDB_COMPONENT_LAZY_START_PRODUCER_DEFAULT = false;
-    public static final String CAMEL_SINK_AWSSDB_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-sdb.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSDB_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSDB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSDB_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-sdb.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSSDB_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSSDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwssdbSinkConnectorConfig(
             ConfigDef config,
@@ -97,10 +94,9 @@ public class CamelAwssdbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSDB_ENDPOINT_PROXY_PROTOCOL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSDB_ENDPOINT_PROXY_PROTOCOL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_ENDPOINT_PROXY_PROTOCOL_DOC);
         conf.define(CAMEL_SINK_AWSSDB_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSDB_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWSSDB_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSDB_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_ENDPOINT_SECRET_KEY_DOC);
-        conf.define(CAMEL_SINK_AWSSDB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSDB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSSDB_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSDB_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSSDB_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSDB_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_COMPONENT_LAZY_START_PRODUCER_DOC);
-        conf.define(CAMEL_SINK_AWSSDB_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSDB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSSDB_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSSDB_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSDB_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-sink.json b/connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-sink.json
index 019edf5..e3e50c0 100644
--- a/connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-sink.json
+++ b/connectors/camel-aws-ses-kafka-connector/src/generated/resources/camel-aws-ses-sink.json
@@ -84,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -185,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-ses.basicPropertyBinding": {
-			"name": "camel.component.aws-ses.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-ses.autowiredEnabled": {
+			"name": "camel.component.aws-ses.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-ses.accessKey": {
diff --git a/connectors/camel-aws-ses-kafka-connector/src/main/docs/camel-aws-ses-kafka-sink-connector.adoc b/connectors/camel-aws-ses-kafka-connector/src/main/docs/camel-aws-ses-kafka-sink-connector.adoc
index ec6292d..8e804ed 100644
--- a/connectors/camel-aws-ses-kafka-connector/src/main/docs/camel-aws-ses-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-ses-kafka-connector/src/main/docs/camel-aws-ses-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsses.CamelAwssesSinkConnector
 ----
 
 
-The camel-aws-ses sink connector supports 31 options, which are listed below.
+The camel-aws-ses sink connector supports 30 options, which are listed below.
 
 
 
@@ -41,7 +41,6 @@ The camel-aws-ses sink connector supports 31 options, which are listed below.
 | *camel.sink.endpoint.returnPath* | The email address to which bounce notifications are to be forwarded, override it using 'CamelAwsSesReturnPath' header. | null | false | MEDIUM
 | *camel.sink.endpoint.subject* | The subject which is used if the message header 'CamelAwsSesSubject' is not present. | null | false | MEDIUM
 | *camel.sink.endpoint.to* | List of destination email address. Can be overriden with 'CamelAwsSesTo' header. | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -57,7 +56,7 @@ The camel-aws-ses sink connector supports 31 options, which are listed below.
 | *camel.component.aws-ses.returnPath* | The email address to which bounce notifications are to be forwarded, override it using 'CamelAwsSesReturnPath' header. | null | false | MEDIUM
 | *camel.component.aws-ses.subject* | The subject which is used if the message header 'CamelAwsSesSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws-ses.to* | List of destination email address. Can be overriden with 'CamelAwsSesTo' header. | null | false | MEDIUM
-| *camel.component.aws-ses.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-ses.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-ses.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-ses.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsses/CamelAwssesSinkConnectorConfig.java b/connectors/camel-aws-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsses/CamelAwssesSinkConnectorConfig.java
index 55fd3d0..fee1750 100644
--- a/connectors/camel-aws-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsses/CamelAwssesSinkConnectorConfig.java
+++ b/connectors/camel-aws-ses-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsses/CamelAwssesSinkConnectorConfig.java
@@ -60,9 +60,6 @@ public class CamelAwssesSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSES_ENDPOINT_TO_CONF = "camel.sink.endpoint.to";
     public static final String CAMEL_SINK_AWSSES_ENDPOINT_TO_DOC = "List of destination email address. Can be overriden with 'CamelAwsSesTo' header.";
     public static final String CAMEL_SINK_AWSSES_ENDPOINT_TO_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSES_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSES_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSES_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSES_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSSES_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSSES_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -108,9 +105,9 @@ public class CamelAwssesSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSES_COMPONENT_TO_CONF = "camel.component.aws-ses.to";
     public static final String CAMEL_SINK_AWSSES_COMPONENT_TO_DOC = "List of destination email address. Can be overriden with 'CamelAwsSesTo' header.";
     public static final String CAMEL_SINK_AWSSES_COMPONENT_TO_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSES_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-ses.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSES_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSES_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSES_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-ses.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSSES_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSSES_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSSES_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-ses.accessKey";
     public static final String CAMEL_SINK_AWSSES_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSSES_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -142,7 +139,6 @@ public class CamelAwssesSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSES_ENDPOINT_RETURN_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_ENDPOINT_RETURN_PATH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_RETURN_PATH_DOC);
         conf.define(CAMEL_SINK_AWSSES_ENDPOINT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_ENDPOINT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWSSES_ENDPOINT_TO_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_ENDPOINT_TO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_TO_DOC);
-        conf.define(CAMEL_SINK_AWSSES_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSES_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSSES_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSES_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSSES_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSES_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_ENDPOINT_SECRET_KEY_DOC);
@@ -158,7 +154,7 @@ public class CamelAwssesSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSES_COMPONENT_RETURN_PATH_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_COMPONENT_RETURN_PATH_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_COMPONENT_RETURN_PATH_DOC);
         conf.define(CAMEL_SINK_AWSSES_COMPONENT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_COMPONENT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_COMPONENT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWSSES_COMPONENT_TO_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_COMPONENT_TO_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_COMPONENT_TO_DOC);
-        conf.define(CAMEL_SINK_AWSSES_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSES_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSSES_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSSES_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSES_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSSES_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSES_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSES_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSES_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-sink.json b/connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-sink.json
index ba2b1da..e28ce47 100644
--- a/connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-sink.json
+++ b/connectors/camel-aws-sns-kafka-connector/src/generated/resources/camel-aws-sns-sink.json
@@ -123,13 +123,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -257,11 +250,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sns.basicPropertyBinding": {
-			"name": "camel.component.aws-sns.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sns.autowiredEnabled": {
+			"name": "camel.component.aws-sns.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-sns.accessKey": {
diff --git a/connectors/camel-aws-sns-kafka-connector/src/main/docs/camel-aws-sns-kafka-sink-connector.adoc b/connectors/camel-aws-sns-kafka-connector/src/main/docs/camel-aws-sns-kafka-sink-connector.adoc
index e169ecd..42e30eb 100644
--- a/connectors/camel-aws-sns-kafka-connector/src/main/docs/camel-aws-sns-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-sns-kafka-connector/src/main/docs/camel-aws-sns-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awssns.CamelAwssnsSinkConnector
 ----
 
 
-The camel-aws-sns sink connector supports 42 options, which are listed below.
+The camel-aws-sns sink connector supports 41 options, which are listed below.
 
 
 
@@ -47,7 +47,6 @@ The camel-aws-sns sink connector supports 42 options, which are listed below.
 | *camel.sink.endpoint.serverSideEncryptionEnabled* | Define if Server Side Encryption is enabled or not on the topic | false | false | MEDIUM
 | *camel.sink.endpoint.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.sink.endpoint.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
@@ -68,7 +67,7 @@ The camel-aws-sns sink connector supports 42 options, which are listed below.
 | *camel.component.aws-sns.serverSideEncryption Enabled* | Define if Server Side Encryption is enabled or not on the topic | false | false | MEDIUM
 | *camel.component.aws-sns.subject* | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. | null | false | MEDIUM
 | *camel.component.aws-sns.subscribeSNStoSQS* | Define if the subscription between SNS Topic and SQS must be done or not | false | false | MEDIUM
-| *camel.component.aws-sns.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-sns.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-sns.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws-sns.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssns/CamelAwssnsSinkConnectorConfig.java b/connectors/camel-aws-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssns/CamelAwssnsSinkConnectorConfig.java
index 5c730a7..0aed8f9 100644
--- a/connectors/camel-aws-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssns/CamelAwssnsSinkConnectorConfig.java
+++ b/connectors/camel-aws-sns-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssns/CamelAwssnsSinkConnectorConfig.java
@@ -78,9 +78,6 @@ public class CamelAwssnsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSCONF = "camel.sink.endpoint.subscribeSNStoSQS";
     public static final String CAMEL_SINK_AWSSNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDOC = "Define if the subscription between SNS Topic and SQS must be done or not";
     public static final Boolean CAMEL_SINK_AWSSNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDEFAULT = false;
-    public static final String CAMEL_SINK_AWSSNS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSNS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSNS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSNS_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSSNS_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSSNS_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -141,9 +138,9 @@ public class CamelAwssnsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSNS_COMPONENT_SUBSCRIBE_SNSTO_SQSCONF = "camel.component.aws-sns.subscribeSNStoSQS";
     public static final String CAMEL_SINK_AWSSNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDOC = "Define if the subscription between SNS Topic and SQS must be done or not";
     public static final Boolean CAMEL_SINK_AWSSNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDEFAULT = false;
-    public static final String CAMEL_SINK_AWSSNS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-sns.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSNS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSNS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSNS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-sns.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSSNS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSSNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSSNS_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws-sns.accessKey";
     public static final String CAMEL_SINK_AWSSNS_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWSSNS_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -181,7 +178,6 @@ public class CamelAwssnsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_SERVER_SIDE_ENCRYPTION_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_ENDPOINT_SERVER_SIDE_ENCRYPTION_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_SERVER_SIDE_ENCRYPTION_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNS_ENDPOINT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSCONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_SUBSCRIBE_SNSTO_SQSDOC);
-        conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNS_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSNS_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNS_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_ENDPOINT_SECRET_KEY_DOC);
@@ -202,7 +198,7 @@ public class CamelAwssnsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSNS_COMPONENT_SERVER_SIDE_ENCRYPTION_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_COMPONENT_SERVER_SIDE_ENCRYPTION_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_COMPONENT_SERVER_SIDE_ENCRYPTION_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSSNS_COMPONENT_SUBJECT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNS_COMPONENT_SUBJECT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_COMPONENT_SUBJECT_DOC);
         conf.define(CAMEL_SINK_AWSSNS_COMPONENT_SUBSCRIBE_SNSTO_SQSCONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_COMPONENT_SUBSCRIBE_SNSTO_SQSDOC);
-        conf.define(CAMEL_SINK_AWSSNS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSSNS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSSNS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSNS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSSNS_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNS_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWSSNS_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSNS_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSNS_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-sink.json b/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-sink.json
index e9e19a8..acaebde 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-sink.json
+++ b/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-sink.json
@@ -106,13 +106,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.delayQueue": {
 			"name": "camel.sink.endpoint.delayQueue",
 			"description": "Define if you want to apply delaySeconds option to the queue or on single messages",
@@ -278,11 +271,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sqs.basicPropertyBinding": {
-			"name": "camel.component.aws-sqs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sqs.autowiredEnabled": {
+			"name": "camel.component.aws-sqs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-sqs.delayQueue": {
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-source.json b/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-source.json
index 5ecb585..2aa2267 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-source.json
+++ b/connectors/camel-aws-sqs-kafka-connector/src/generated/resources/camel-aws-sqs-source.json
@@ -189,13 +189,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.delayQueue": {
 			"name": "camel.source.endpoint.delayQueue",
 			"description": "Define if you want to apply delaySeconds option to the queue or on single messages",
@@ -506,11 +499,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-sqs.basicPropertyBinding": {
-			"name": "camel.component.aws-sqs.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-sqs.autowiredEnabled": {
+			"name": "camel.component.aws-sqs.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-sqs.delayQueue": {
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-sink-connector.adoc b/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-sink-connector.adoc
index ab94e14..86c618c 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awssqs.CamelAwssqsSinkConnector
 ----
 
 
-The camel-aws-sqs sink connector supports 54 options, which are listed below.
+The camel-aws-sqs sink connector supports 53 options, which are listed below.
 
 
 
@@ -44,7 +44,6 @@ The camel-aws-sqs sink connector supports 54 options, which are listed below.
 | *camel.sink.endpoint.messageDeduplicationIdStrategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
 | *camel.sink.endpoint.messageGroupIdStrategy* | Only for FIFO queues. Strategy for setting the messageGroupId on the message. Can be one of the following options: useConstant, useExchangeId, usePropertyValue. For the usePropertyValue option, the value of property CamelAwsMessageGroupId will be used. One of: [useConstant] [useExchangeId] [usePropertyValue] | null | false | MEDIUM
 | *camel.sink.endpoint.operation* | The operation to do in case the user don't want to send only a message One of: [sendBatchMessage] [deleteMessage] [listQueues] | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.delayQueue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | false | MEDIUM
 | *camel.sink.endpoint.queueUrl* | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. | null | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
@@ -71,7 +70,7 @@ The camel-aws-sqs sink connector supports 54 options, which are listed below.
 | *camel.component.aws-sqs.messageDeduplicationId Strategy* | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. One of: [useExchangeId] [useContentBasedDeduplication] | "useExchangeId" | false | MEDIUM
 | *camel.component.aws-sqs.messageGroupIdStrategy* | Only for FIFO queues. Strategy for setting the messageGroupId on the message. Can be one of the following options: useConstant, useExchangeId, usePropertyValue. For the usePropertyValue option, the value of property CamelAwsMessageGroupId will be used. One of: [useConstant] [useExchangeId] [usePropertyValue] | null | false | MEDIUM
 | *camel.component.aws-sqs.operation* | The operation to do in case the user don't want to send only a message One of: [sendBatchMessage] [deleteMessage] [listQueues] | null | false | MEDIUM
-| *camel.component.aws-sqs.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-sqs.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-sqs.delayQueue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | false | MEDIUM
 | *camel.component.aws-sqs.queueUrl* | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. | null | false | MEDIUM
 | *camel.component.aws-sqs.proxyHost* | To define a proxy host when instantiating the SQS client | null | false | MEDIUM
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-source-connector.adoc b/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-source-connector.adoc
index 7c4f43d..b4b2a8a 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-source-connector.adoc
+++ b/connectors/camel-aws-sqs-kafka-connector/src/main/docs/camel-aws-sqs-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awssqs.CamelAwssqsSourceConnecto
 ----
 
 
-The camel-aws-sqs source connector supports 89 options, which are listed below.
+The camel-aws-sqs source connector supports 88 options, which are listed below.
 
 
 
@@ -57,7 +57,6 @@ The camel-aws-sqs source connector supports 89 options, which are listed below.
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.delayQueue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | false | MEDIUM
 | *camel.source.endpoint.queueUrl* | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. | null | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
@@ -106,7 +105,7 @@ The camel-aws-sqs source connector supports 89 options, which are listed below.
 | *camel.component.aws-sqs.serverSideEncryption Enabled* | Define if Server Side Encryption is enabled or not on the queue | false | false | MEDIUM
 | *camel.component.aws-sqs.visibilityTimeout* | The duration (in seconds) that the received messages are hidden from subsequent retrieve requests after being retrieved by a ReceiveMessage request to set in the com.amazonaws.services.sqs.model.SetQueueAttributesRequest. This only make sense if its different from defaultVisibilityTimeout. It changes the queue visibility timeout attribute permanently. | null | false | MEDIUM
 | *camel.component.aws-sqs.waitTimeSeconds* | Duration in seconds (0 to 20) that the ReceiveMessage action call will wait until a message is in the queue to include in the response. | null | false | MEDIUM
-| *camel.component.aws-sqs.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-sqs.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-sqs.delayQueue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | false | MEDIUM
 | *camel.component.aws-sqs.queueUrl* | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. | null | false | MEDIUM
 | *camel.component.aws-sqs.proxyHost* | To define a proxy host when instantiating the SQS client | null | false | MEDIUM
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSinkConnectorConfig.java b/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSinkConnectorConfig.java
index 87c755d..cd73a4f 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSinkConnectorConfig.java
+++ b/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSinkConnectorConfig.java
@@ -69,9 +69,6 @@ public class CamelAwssqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSQS_ENDPOINT_OPERATION_CONF = "camel.sink.endpoint.operation";
     public static final String CAMEL_SINK_AWSSQS_ENDPOINT_OPERATION_DOC = "The operation to do in case the user don't want to send only a message One of: [sendBatchMessage] [deleteMessage] [listQueues]";
     public static final String CAMEL_SINK_AWSSQS_ENDPOINT_OPERATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSQS_ENDPOINT_DELAY_QUEUE_CONF = "camel.sink.endpoint.delayQueue";
     public static final String CAMEL_SINK_AWSSQS_ENDPOINT_DELAY_QUEUE_DOC = "Define if you want to apply delaySeconds option to the queue or on single messages";
     public static final Boolean CAMEL_SINK_AWSSQS_ENDPOINT_DELAY_QUEUE_DEFAULT = false;
@@ -150,9 +147,9 @@ public class CamelAwssqsSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSQS_COMPONENT_OPERATION_CONF = "camel.component.aws-sqs.operation";
     public static final String CAMEL_SINK_AWSSQS_COMPONENT_OPERATION_DOC = "The operation to do in case the user don't want to send only a message One of: [sendBatchMessage] [deleteMessage] [listQueues]";
     public static final String CAMEL_SINK_AWSSQS_COMPONENT_OPERATION_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-sqs.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-sqs.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSSQS_COMPONENT_DELAY_QUEUE_CONF = "camel.component.aws-sqs.delayQueue";
     public static final String CAMEL_SINK_AWSSQS_COMPONENT_DELAY_QUEUE_DOC = "Define if you want to apply delaySeconds option to the queue or on single messages";
     public static final Boolean CAMEL_SINK_AWSSQS_COMPONENT_DELAY_QUEUE_DEFAULT = false;
@@ -214,7 +211,6 @@ public class CamelAwssqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_MESSAGE_GROUP_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_ENDPOINT_MESSAGE_GROUP_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_MESSAGE_GROUP_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_ENDPOINT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_DELAY_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQS_ENDPOINT_DELAY_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_DELAY_QUEUE_DOC);
         conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_QUEUE_URL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_ENDPOINT_QUEUE_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_QUEUE_URL_DOC);
         conf.define(CAMEL_SINK_AWSSQS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_ENDPOINT_SYNCHRONOUS_DOC);
@@ -241,7 +237,7 @@ public class CamelAwssqsSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_MESSAGE_DEDUPLICATION_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWSSQS_COMPONENT_MESSAGE_GROUP_ID_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_COMPONENT_MESSAGE_GROUP_ID_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_MESSAGE_GROUP_ID_STRATEGY_DOC);
         conf.define(CAMEL_SINK_AWSSQS_COMPONENT_OPERATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_COMPONENT_OPERATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_OPERATION_DOC);
-        conf.define(CAMEL_SINK_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSSQS_COMPONENT_DELAY_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSQS_COMPONENT_DELAY_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_DELAY_QUEUE_DOC);
         conf.define(CAMEL_SINK_AWSSQS_COMPONENT_QUEUE_URL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_COMPONENT_QUEUE_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_QUEUE_URL_DOC);
         conf.define(CAMEL_SINK_AWSSQS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSQS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSQS_COMPONENT_PROXY_HOST_DOC);
diff --git a/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSourceConnectorConfig.java b/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSourceConnectorConfig.java
index 10730e3..ef36752 100644
--- a/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSourceConnectorConfig.java
+++ b/connectors/camel-aws-sqs-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awssqs/CamelAwssqsSourceConnectorConfig.java
@@ -110,9 +110,6 @@ public class CamelAwssqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_POLL_STRATEGY_CONF = "camel.source.endpoint.pollStrategy";
     public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_POLL_STRATEGY_DOC = "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.";
     public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_POLL_STRATEGY_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_DELAY_QUEUE_CONF = "camel.source.endpoint.delayQueue";
     public static final String CAMEL_SOURCE_AWSSQS_ENDPOINT_DELAY_QUEUE_DOC = "Define if you want to apply delaySeconds option to the queue or on single messages";
     public static final Boolean CAMEL_SOURCE_AWSSQS_ENDPOINT_DELAY_QUEUE_DEFAULT = false;
@@ -257,9 +254,9 @@ public class CamelAwssqsSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_WAIT_TIME_SECONDS_CONF = "camel.component.aws-sqs.waitTimeSeconds";
     public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_WAIT_TIME_SECONDS_DOC = "Duration in seconds (0 to 20) that the ReceiveMessage action call will wait until a message is in the queue to include in the response.";
     public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_WAIT_TIME_SECONDS_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-sqs.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-sqs.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_DELAY_QUEUE_CONF = "camel.component.aws-sqs.delayQueue";
     public static final String CAMEL_SOURCE_AWSSQS_COMPONENT_DELAY_QUEUE_DOC = "Define if you want to apply delaySeconds option to the queue or on single messages";
     public static final Boolean CAMEL_SOURCE_AWSSQS_COMPONENT_DELAY_QUEUE_DEFAULT = false;
@@ -334,7 +331,6 @@ public class CamelAwssqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_EXCEPTION_HANDLER_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_ENDPOINT_EXCEPTION_HANDLER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_EXCEPTION_HANDLER_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_EXCHANGE_PATTERN_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_ENDPOINT_EXCHANGE_PATTERN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_EXCHANGE_PATTERN_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_POLL_STRATEGY_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_ENDPOINT_POLL_STRATEGY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_POLL_STRATEGY_DOC);
-        conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_DELAY_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_ENDPOINT_DELAY_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_DELAY_QUEUE_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_QUEUE_URL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_ENDPOINT_QUEUE_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_QUEUE_URL_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_ENDPOINT_SYNCHRONOUS_DOC);
@@ -383,7 +379,7 @@ public class CamelAwssqsSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_SERVER_SIDE_ENCRYPTION_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_COMPONENT_SERVER_SIDE_ENCRYPTION_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_SERVER_SIDE_ENCRYPTION_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_VISIBILITY_TIMEOUT_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_COMPONENT_VISIBILITY_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_VISIBILITY_TIMEOUT_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_WAIT_TIME_SECONDS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_COMPONENT_WAIT_TIME_SECONDS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_WAIT_TIME_SECONDS_DOC);
-        conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AWSSQS_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_DELAY_QUEUE_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSQS_COMPONENT_DELAY_QUEUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_DELAY_QUEUE_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_QUEUE_URL_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_COMPONENT_QUEUE_URL_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_QUEUE_URL_DOC);
         conf.define(CAMEL_SOURCE_AWSSQS_COMPONENT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSQS_COMPONENT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSQS_COMPONENT_PROXY_HOST_DOC);
diff --git a/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-sink.json b/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-sink.json
index 9787bf1..a29a544 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-sink.json
+++ b/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-sink.json
@@ -64,13 +64,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientConfigurationParameters": {
 			"name": "camel.sink.endpoint.clientConfigurationParameters",
 			"description": "To configure the ClientConfiguration using the key\/values from the Map.",
@@ -214,11 +207,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-swf.basicPropertyBinding": {
-			"name": "camel.component.aws-swf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-swf.autowiredEnabled": {
+			"name": "camel.component.aws-swf.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-swf.clientConfigurationParameters": {
diff --git a/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-source.json b/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-source.json
index 96f1cea..6ae4000 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-source.json
+++ b/connectors/camel-aws-swf-kafka-connector/src/generated/resources/camel-aws-swf-source.json
@@ -95,13 +95,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.clientConfigurationParameters": {
 			"name": "camel.source.endpoint.clientConfigurationParameters",
 			"description": "To configure the ClientConfiguration using the key\/values from the Map.",
@@ -225,11 +218,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-swf.basicPropertyBinding": {
-			"name": "camel.component.aws-swf.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-swf.autowiredEnabled": {
+			"name": "camel.component.aws-swf.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws-swf.clientConfigurationParameters": {
diff --git a/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-sink-connector.adoc b/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-sink-connector.adoc
index 0810db6..f2dd8d9 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsswf.CamelAwsswfSinkConnector
 ----
 
 
-The camel-aws-swf sink connector supports 47 options, which are listed below.
+The camel-aws-swf sink connector supports 46 options, which are listed below.
 
 
 
@@ -38,7 +38,6 @@ The camel-aws-swf sink connector supports 47 options, which are listed below.
 | *camel.sink.endpoint.version* | The workflow or activity event version to use. | null | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.activitySchedulingOptions* | Activity scheduling options | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.clientConfigurationParameters* | To configure the ClientConfiguration using the key/values from the Map. | null | false | MEDIUM
 | *camel.sink.endpoint.startWorkflowOptionsParameters* | To configure the StartWorkflowOptions using the key/values from the Map. | null | false | MEDIUM
 | *camel.sink.endpoint.sWClientParameters* | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. | null | false | MEDIUM
@@ -62,7 +61,7 @@ The camel-aws-swf sink connector supports 47 options, which are listed below.
 | *camel.component.aws-swf.version* | The workflow or activity event version to use. | null | false | MEDIUM
 | *camel.component.aws-swf.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...]
 | *camel.component.aws-swf.activitySchedulingOptions* | Activity scheduling options | null | false | MEDIUM
-| *camel.component.aws-swf.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-swf.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-swf.clientConfiguration Parameters* | To configure the ClientConfiguration using the key/values from the Map. | null | false | MEDIUM
 | *camel.component.aws-swf.startWorkflowOptions Parameters* | To configure the StartWorkflowOptions using the key/values from the Map. | null | false | MEDIUM
 | *camel.component.aws-swf.sWClientParameters* | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. | null | false | MEDIUM
diff --git a/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-source-connector.adoc b/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-source-connector.adoc
index cd1a61a..38a017f 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-source-connector.adoc
+++ b/connectors/camel-aws-swf-kafka-connector/src/main/docs/camel-aws-swf-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awsswf.CamelAwsswfSourceConnecto
 ----
 
 
-The camel-aws-swf source connector supports 43 options, which are listed below.
+The camel-aws-swf source connector supports 42 options, which are listed below.
 
 
 
@@ -43,7 +43,6 @@ The camel-aws-swf source connector supports 43 options, which are listed below.
 | *camel.source.endpoint.activityThreadPoolSize* | Maximum number of threads in work pool for activity. | 100 | false | MEDIUM
 | *camel.source.endpoint.activityTypeExecutionOptions* | Activity execution options | null | false | MEDIUM
 | *camel.source.endpoint.activityTypeRegistration Options* | Activity registration options | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.clientConfiguration Parameters* | To configure the ClientConfiguration using the key/values from the Map. | null | false | MEDIUM
 | *camel.source.endpoint.startWorkflowOptions Parameters* | To configure the StartWorkflowOptions using the key/values from the Map. | null | false | MEDIUM
 | *camel.source.endpoint.sWClientParameters* | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. | null | false | MEDIUM
@@ -64,7 +63,7 @@ The camel-aws-swf source connector supports 43 options, which are listed below.
 | *camel.component.aws-swf.activityThreadPoolSize* | Maximum number of threads in work pool for activity. | 100 | false | MEDIUM
 | *camel.component.aws-swf.activityTypeExecution Options* | Activity execution options | null | false | MEDIUM
 | *camel.component.aws-swf.activityTypeRegistration Options* | Activity registration options | null | false | MEDIUM
-| *camel.component.aws-swf.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-swf.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws-swf.clientConfiguration Parameters* | To configure the ClientConfiguration using the key/values from the Map. | null | false | MEDIUM
 | *camel.component.aws-swf.startWorkflowOptions Parameters* | To configure the StartWorkflowOptions using the key/values from the Map. | null | false | MEDIUM
 | *camel.component.aws-swf.sWClientParameters* | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. | null | false | MEDIUM
diff --git a/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSinkConnectorConfig.java b/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSinkConnectorConfig.java
index 811d654..1c017cf 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSinkConnectorConfig.java
+++ b/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSinkConnectorConfig.java
@@ -51,9 +51,6 @@ public class CamelAwsswfSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSWF_ENDPOINT_ACTIVITY_SCHEDULING_OPTIONS_CONF = "camel.sink.endpoint.activitySchedulingOptions";
     public static final String CAMEL_SINK_AWSSWF_ENDPOINT_ACTIVITY_SCHEDULING_OPTIONS_DOC = "Activity scheduling options";
     public static final String CAMEL_SINK_AWSSWF_ENDPOINT_ACTIVITY_SCHEDULING_OPTIONS_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_CONF = "camel.sink.endpoint.clientConfigurationParameters";
     public static final String CAMEL_SINK_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DOC = "To configure the ClientConfiguration using the key/values from the Map.";
     public static final String CAMEL_SINK_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT = null;
@@ -123,9 +120,9 @@ public class CamelAwsswfSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWSSWF_COMPONENT_ACTIVITY_SCHEDULING_OPTIONS_CONF = "camel.component.aws-swf.activitySchedulingOptions";
     public static final String CAMEL_SINK_AWSSWF_COMPONENT_ACTIVITY_SCHEDULING_OPTIONS_DOC = "Activity scheduling options";
     public static final String CAMEL_SINK_AWSSWF_COMPONENT_ACTIVITY_SCHEDULING_OPTIONS_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-swf.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-swf.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_CONF = "camel.component.aws-swf.clientConfigurationParameters";
     public static final String CAMEL_SINK_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DOC = "To configure the ClientConfiguration using the key/values from the Map.";
     public static final String CAMEL_SINK_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT = null;
@@ -187,7 +184,6 @@ public class CamelAwsswfSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_ENDPOINT_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_VERSION_DOC);
         conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSWF_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_ACTIVITY_SCHEDULING_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_ENDPOINT_ACTIVITY_SCHEDULING_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_ACTIVITY_SCHEDULING_OPTIONS_DOC);
-        conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_START_WORKFLOW_OPTIONS_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_ENDPOINT_START_WORKFLOW_OPTIONS_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_START_WORKFLOW_OPTIONS_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AWSSWF_ENDPOINT_SWCLIENT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_ENDPOINT_SWCLIENT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_ENDPOINT_SWCLIENT_PARAMETERS_DOC);
@@ -211,7 +207,7 @@ public class CamelAwsswfSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWSSWF_COMPONENT_VERSION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_COMPONENT_VERSION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_VERSION_DOC);
         conf.define(CAMEL_SINK_AWSSWF_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSWF_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWSSWF_COMPONENT_ACTIVITY_SCHEDULING_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_COMPONENT_ACTIVITY_SCHEDULING_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_ACTIVITY_SCHEDULING_OPTIONS_DOC);
-        conf.define(CAMEL_SINK_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AWSSWF_COMPONENT_START_WORKFLOW_OPTIONS_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_COMPONENT_START_WORKFLOW_OPTIONS_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_START_WORKFLOW_OPTIONS_PARAMETERS_DOC);
         conf.define(CAMEL_SINK_AWSSWF_COMPONENT_SWCLIENT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSSWF_COMPONENT_SWCLIENT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSSWF_COMPONENT_SWCLIENT_PARAMETERS_DOC);
diff --git a/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSourceConnectorConfig.java b/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSourceConnectorConfig.java
index abe5ec0..1bb784b 100644
--- a/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSourceConnectorConfig.java
+++ b/connectors/camel-aws-swf-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awsswf/CamelAwsswfSourceConnectorConfig.java
@@ -68,9 +68,6 @@ public class CamelAwsswfSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_CONF = "camel.source.endpoint.activityTypeRegistrationOptions";
     public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DOC = "Activity registration options";
     public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.source.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_CONF = "camel.source.endpoint.clientConfigurationParameters";
     public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DOC = "To configure the ClientConfiguration using the key/values from the Map.";
     public static final String CAMEL_SOURCE_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT = null;
@@ -131,9 +128,9 @@ public class CamelAwsswfSourceConnectorConfig
     public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_CONF = "camel.component.aws-swf.activityTypeRegistrationOptions";
     public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DOC = "Activity registration options";
     public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DEFAULT = null;
-    public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-swf.basicPropertyBinding";
-    public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SOURCE_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-swf.autowiredEnabled";
+    public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SOURCE_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_CONF = "camel.component.aws-swf.clientConfigurationParameters";
     public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DOC = "To configure the ClientConfiguration using the key/values from the Map.";
     public static final String CAMEL_SOURCE_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT = null;
@@ -182,7 +179,6 @@ public class CamelAwsswfSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_THREAD_POOL_SIZE_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_THREAD_POOL_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_THREAD_POOL_SIZE_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_EXECUTION_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_EXECUTION_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_EXECUTION_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DOC);
-        conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_CLIENT_CONFIGURATION_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_START_WORKFLOW_OPTIONS_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_ENDPOINT_START_WORKFLOW_OPTIONS_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_START_WORKFLOW_OPTIONS_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_ENDPOINT_SWCLIENT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_ENDPOINT_SWCLIENT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_ENDPOINT_SWCLIENT_PARAMETERS_DOC);
@@ -203,7 +199,7 @@ public class CamelAwsswfSourceConnectorConfig
         conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_THREAD_POOL_SIZE_CONF, ConfigDef.Type.INT, CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_THREAD_POOL_SIZE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_THREAD_POOL_SIZE_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_EXECUTION_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_EXECUTION_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_EXECUTION_OPTIONS_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_ACTIVITY_TYPE_REGISTRATION_OPTIONS_DOC);
-        conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SOURCE_AWSSWF_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SOURCE_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_CLIENT_CONFIGURATION_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_START_WORKFLOW_OPTIONS_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_COMPONENT_START_WORKFLOW_OPTIONS_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_START_WORKFLOW_OPTIONS_PARAMETERS_DOC);
         conf.define(CAMEL_SOURCE_AWSSWF_COMPONENT_SWCLIENT_PARAMETERS_CONF, ConfigDef.Type.STRING, CAMEL_SOURCE_AWSSWF_COMPONENT_SWCLIENT_PARAMETERS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SOURCE_AWSSWF_COMPONENT_SWCLIENT_PARAMETERS_DOC);
diff --git a/connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-sink.json b/connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-sink.json
index 7f4e66b..6bac73f 100644
--- a/connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-sink.json
+++ b/connectors/camel-aws-translate-kafka-connector/src/generated/resources/camel-aws-translate-sink.json
@@ -98,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -201,11 +194,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws-translate.basicPropertyBinding": {
-			"name": "camel.component.aws-translate.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws-translate.autowiredEnabled": {
+			"name": "camel.component.aws-translate.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		}
 	}
diff --git a/connectors/camel-aws-translate-kafka-connector/src/main/docs/camel-aws-translate-kafka-sink-connector.adoc b/connectors/camel-aws-translate-kafka-connector/src/main/docs/camel-aws-translate-kafka-sink-connector.adoc
index 1fd89fe..3a09bc9 100644
--- a/connectors/camel-aws-translate-kafka-connector/src/main/docs/camel-aws-translate-kafka-sink-connector.adoc
+++ b/connectors/camel-aws-translate-kafka-connector/src/main/docs/camel-aws-translate-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.awstranslate.CamelAwstranslateSi
 ----
 
 
-The camel-aws-translate sink connector supports 31 options, which are listed below.
+The camel-aws-translate sink connector supports 30 options, which are listed below.
 
 
 
@@ -43,7 +43,6 @@ The camel-aws-translate sink connector supports 31 options, which are listed bel
 | *camel.sink.endpoint.sourceLanguage* | Source language to use | null | false | MEDIUM
 | *camel.sink.endpoint.targetLanguage* | Target language to use | null | false | MEDIUM
 | *camel.sink.endpoint.translateClient* | To use a existing configured AWS Translate as client | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws-translate.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws-translate.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
@@ -59,7 +58,7 @@ The camel-aws-translate sink connector supports 31 options, which are listed bel
 | *camel.component.aws-translate.sourceLanguage* | Source language to use | null | false | MEDIUM
 | *camel.component.aws-translate.targetLanguage* | Target language to use | null | false | MEDIUM
 | *camel.component.aws-translate.translateClient* | To use a existing configured AWS Translate as client | null | false | MEDIUM
-| *camel.component.aws-translate.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws-translate.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 |===
 
 
diff --git a/connectors/camel-aws-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstranslate/CamelAwstranslateSinkConnectorConfig.java b/connectors/camel-aws-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstranslate/CamelAwstranslateSinkConnectorConfig.java
index 6f1f60f..4e75fad 100644
--- a/connectors/camel-aws-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstranslate/CamelAwstranslateSinkConnectorConfig.java
+++ b/connectors/camel-aws-translate-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/awstranslate/CamelAwstranslateSinkConnectorConfig.java
@@ -68,9 +68,6 @@ public class CamelAwstranslateSinkConnectorConfig
     public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TRANSLATE_CLIENT_CONF = "camel.sink.endpoint.translateClient";
     public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TRANSLATE_CLIENT_DOC = "To use a existing configured AWS Translate as client";
     public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TRANSLATE_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSTRANSLATE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -116,9 +113,9 @@ public class CamelAwstranslateSinkConnectorConfig
     public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_TRANSLATE_CLIENT_CONF = "camel.component.aws-translate.translateClient";
     public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_TRANSLATE_CLIENT_DOC = "To use a existing configured AWS Translate as client";
     public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_TRANSLATE_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws-translate.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWSTRANSLATE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws-translate.autowiredEnabled";
+    public static final String CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
 
     public CamelAwstranslateSinkConnectorConfig(
             ConfigDef config,
@@ -146,7 +143,6 @@ public class CamelAwstranslateSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SOURCE_LANGUAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SOURCE_LANGUAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SOURCE_LANGUAGE_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TARGET_LANGUAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TARGET_LANGUAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TARGET_LANGUAGE_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TRANSLATE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TRANSLATE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_TRANSLATE_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSTRANSLATE_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_COMPONENT_ACCESS_KEY_DOC);
@@ -162,7 +158,7 @@ public class CamelAwstranslateSinkConnectorConfig
         conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_SOURCE_LANGUAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_COMPONENT_SOURCE_LANGUAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_COMPONENT_SOURCE_LANGUAGE_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_TARGET_LANGUAGE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_COMPONENT_TARGET_LANGUAGE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_COMPONENT_TARGET_LANGUAGE_DOC);
         conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_TRANSLATE_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWSTRANSLATE_COMPONENT_TRANSLATE_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_COMPONENT_TRANSLATE_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSTRANSLATE_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWSTRANSLATE_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWSTRANSLATE_COMPONENT_AUTOWIRED_ENABLED_DOC);
         return conf;
     }
 }
\ No newline at end of file
diff --git a/connectors/camel-aws2-athena-kafka-connector/src/generated/resources/camel-aws2-athena-sink.json b/connectors/camel-aws2-athena-kafka-connector/src/generated/resources/camel-aws2-athena-sink.json
index a1e1013..b6315b8 100644
--- a/connectors/camel-aws2-athena-kafka-connector/src/generated/resources/camel-aws2-athena-sink.json
+++ b/connectors/camel-aws2-athena-kafka-connector/src/generated/resources/camel-aws2-athena-sink.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.accessKey": {
 			"name": "camel.sink.endpoint.accessKey",
 			"description": "Amazon AWS Access Key.",
@@ -189,13 +182,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.clientRequestToken": {
 			"name": "camel.sink.endpoint.clientRequestToken",
 			"description": "A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this.",
@@ -221,13 +207,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-athena.autoDiscoverClient": {
-			"name": "camel.component.aws2-athena.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-athena.configuration": {
 			"name": "camel.component.aws2-athena.configuration",
 			"description": "The component configuration.",
@@ -389,11 +368,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-athena.basicPropertyBinding": {
-			"name": "camel.component.aws2-athena.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-athena.autowiredEnabled": {
+			"name": "camel.component.aws2-athena.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-athena.clientRequestToken": {
diff --git a/connectors/camel-aws2-athena-kafka-connector/src/main/docs/camel-aws2-athena-kafka-sink-connector.adoc b/connectors/camel-aws2-athena-kafka-connector/src/main/docs/camel-aws2-athena-kafka-sink-connector.adoc
index 052a7f2..17a4e3e 100644
--- a/connectors/camel-aws2-athena-kafka-connector/src/main/docs/camel-aws2-athena-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-athena-kafka-connector/src/main/docs/camel-aws2-athena-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2athena.CamelAws2athenaSinkCo
 ----
 
 
-The camel-aws2-athena sink connector supports 61 options, which are listed below.
+The camel-aws2-athena sink connector supports 58 options, which are listed below.
 
 
 
@@ -30,7 +30,6 @@ The camel-aws2-athena sink connector supports 61 options, which are listed below
 |===
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.label* | Logical name | null | true | HIGH
-| *camel.sink.endpoint.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key. | null | false | MEDIUM
 | *camel.sink.endpoint.amazonAthenaClient* | The AmazonAthena instance to use as the client. | null | false | MEDIUM
 | *camel.sink.endpoint.database* | The Athena database to use. | null | false | MEDIUM
@@ -57,12 +56,10 @@ The camel-aws2-athena sink connector supports 61 options, which are listed below
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key. | null | false | MEDIUM
 | *camel.sink.endpoint.waitTimeout* | Optional max wait time in millis to wait for a successful query completion. See the section 'Waiting for Query Completion and Retrying Failed Queries' to learn more. | 0L | false | MEDIUM
 | *camel.sink.endpoint.workGroup* | The workgroup to use for running the query. | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.clientRequestToken* | A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this. | null | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.component.aws2-athena.accessKey* | Amazon AWS Access Key. | null | false | MEDIUM
 | *camel.component.aws2-athena.amazonAthenaClient* | The AmazonAthena instance to use as the client. | null | false | MEDIUM
-| *camel.component.aws2-athena.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | false | MEDIUM
 | *camel.component.aws2-athena.configuration* | The component configuration. | null | false | MEDIUM
 | *camel.component.aws2-athena.database* | The Athena database to use. | null | false | MEDIUM
 | *camel.component.aws2-athena.delay* | Milliseconds before the next poll for query execution status. See the section 'Waiting for Query Completion and Retrying Failed Queries' to learn more. | 2000L | false | MEDIUM
@@ -88,7 +85,7 @@ The camel-aws2-athena sink connector supports 61 options, which are listed below
 | *camel.component.aws2-athena.secretKey* | Amazon AWS Secret Key. | null | false | MEDIUM
 | *camel.component.aws2-athena.waitTimeout* | Optional max wait time in millis to wait for a successful query completion. See the section 'Waiting for Query Completion and Retrying Failed Queries' to learn more. | 0L | false | MEDIUM
 | *camel.component.aws2-athena.workGroup* | The workgroup to use for running the query. | null | false | MEDIUM
-| *camel.component.aws2-athena.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws2-athena.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-athena.clientRequestToken* | A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this. | null | false | MEDIUM
 |===
 
diff --git a/connectors/camel-aws2-athena-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2athena/CamelAws2athenaSinkConnectorConfig.java b/connectors/camel-aws2-athena-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2athena/CamelAws2athenaSinkConnectorConfig.java
index ee377cb..a25afff 100644
--- a/connectors/camel-aws2-athena-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2athena/CamelAws2athenaSinkConnectorConfig.java
+++ b/connectors/camel-aws2-athena-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2athena/CamelAws2athenaSinkConnectorConfig.java
@@ -29,9 +29,6 @@ public class CamelAws2athenaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2ATHENA_PATH_LABEL_CONF = "camel.sink.path.label";
     public static final String CAMEL_SINK_AWS2ATHENA_PATH_LABEL_DOC = "Logical name";
     public static final String CAMEL_SINK_AWS2ATHENA_PATH_LABEL_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC = "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking";
-    public static final Boolean CAMEL_SINK_AWS2ATHENA_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_ACCESS_KEY_CONF = "camel.sink.endpoint.accessKey";
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_ACCESS_KEY_DOC = "Amazon AWS Access Key.";
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_ACCESS_KEY_DEFAULT = null;
@@ -110,9 +107,6 @@ public class CamelAws2athenaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_WORK_GROUP_CONF = "camel.sink.endpoint.workGroup";
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_WORK_GROUP_DOC = "The workgroup to use for running the query.";
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_WORK_GROUP_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWS2ATHENA_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_CLIENT_REQUEST_TOKEN_CONF = "camel.sink.endpoint.clientRequestToken";
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_CLIENT_REQUEST_TOKEN_DOC = "A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this.";
     public static final String CAMEL_SINK_AWS2ATHENA_ENDPOINT_CLIENT_REQUEST_TOKEN_DEFAULT = null;
@@ -125,9 +119,6 @@ public class CamelAws2athenaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AMAZON_ATHENA_CLIENT_CONF = "camel.component.aws2-athena.amazonAthenaClient";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AMAZON_ATHENA_CLIENT_DOC = "The AmazonAthena instance to use as the client.";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AMAZON_ATHENA_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws2-athena.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTO_DISCOVER_CLIENT_DOC = "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking";
-    public static final Boolean CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-athena.configuration";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_CONFIGURATION_DOC = "The component configuration.";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -203,9 +194,9 @@ public class CamelAws2athenaSinkConnectorConfig
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_WORK_GROUP_CONF = "camel.component.aws2-athena.workGroup";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_WORK_GROUP_DOC = "The workgroup to use for running the query.";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_WORK_GROUP_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws2-athena.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWS2ATHENA_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-athena.autowiredEnabled";
+    public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_CLIENT_REQUEST_TOKEN_CONF = "camel.component.aws2-athena.clientRequestToken";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_CLIENT_REQUEST_TOKEN_DOC = "A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this.";
     public static final String CAMEL_SINK_AWS2ATHENA_COMPONENT_CLIENT_REQUEST_TOKEN_DEFAULT = null;
@@ -223,7 +214,6 @@ public class CamelAws2athenaSinkConnectorConfig
     public static ConfigDef conf() {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWS2ATHENA_PATH_LABEL_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_PATH_LABEL_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2ATHENA_PATH_LABEL_DOC);
-        conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ATHENA_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_AMAZON_ATHENA_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_ENDPOINT_AMAZON_ATHENA_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_AMAZON_ATHENA_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_DATABASE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_ENDPOINT_DATABASE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_DATABASE_DOC);
@@ -250,12 +240,10 @@ public class CamelAws2athenaSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_WAIT_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SINK_AWS2ATHENA_ENDPOINT_WAIT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_WAIT_TIMEOUT_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_WORK_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_ENDPOINT_WORK_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_WORK_GROUP_DOC);
-        conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ATHENA_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_CLIENT_REQUEST_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_ENDPOINT_CLIENT_REQUEST_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_CLIENT_REQUEST_TOKEN_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ATHENA_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_AMAZON_ATHENA_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_AMAZON_ATHENA_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_AMAZON_ATHENA_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_DATABASE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_DATABASE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_DATABASE_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_DELAY_CONF, ConfigDef.Type.LONG, CAMEL_SINK_AWS2ATHENA_COMPONENT_DELAY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_DELAY_DOC);
@@ -281,7 +269,7 @@ public class CamelAws2athenaSinkConnectorConfig
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_WAIT_TIMEOUT_CONF, ConfigDef.Type.LONG, CAMEL_SINK_AWS2ATHENA_COMPONENT_WAIT_TIMEOUT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_WAIT_TIMEOUT_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_WORK_GROUP_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_WORK_GROUP_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_WORK_GROUP_DOC);
-        conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ATHENA_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWS2ATHENA_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2ATHENA_COMPONENT_CLIENT_REQUEST_TOKEN_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2ATHENA_COMPONENT_CLIENT_REQUEST_TOKEN_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2ATHENA_COMPONENT_CLIENT_REQUEST_TOKEN_DOC);
         return conf;
     }
diff --git a/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-sink.json b/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-sink.json
index 656469a..10f93b9 100644
--- a/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-sink.json
+++ b/connectors/camel-aws2-cw-kafka-connector/src/generated/resources/camel-aws2-cw-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.lazyStartProducer": {
 			"name": "camel.sink.endpoint.lazyStartProducer",
 			"description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the pr [...]
@@ -91,13 +84,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -123,13 +109,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-cw.autoDiscoverClient": {
-			"name": "camel.component.aws2-cw.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-cw.configuration": {
 			"name": "camel.component.aws2-cw.configuration",
 			"description": "The component configuration",
@@ -199,11 +178,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-cw.basicPropertyBinding": {
-			"name": "camel.component.aws2-cw.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-cw.autowiredEnabled": {
+			"name": "camel.component.aws2-cw.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-cw.accessKey": {
diff --git a/connectors/camel-aws2-cw-kafka-connector/src/main/docs/camel-aws2-cw-kafka-sink-connector.adoc b/connectors/camel-aws2-cw-kafka-connector/src/main/docs/camel-aws2-cw-kafka-sink-connector.adoc
index 21802c4..2857201 100644
--- a/connectors/camel-aws2-cw-kafka-connector/src/main/docs/camel-aws2-cw-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-cw-kafka-connector/src/main/docs/camel-aws2-cw-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2cw.CamelAws2cwSinkConnector
 ----
 
 
-The camel-aws2-cw sink connector supports 33 options, which are listed below.
+The camel-aws2-cw sink connector supports 30 options, which are listed below.
 
 
 
@@ -31,7 +31,6 @@ The camel-aws2-cw sink connector supports 33 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.namespace* | The metric namespace | null | true | HIGH
 | *camel.sink.endpoint.amazonCwClient* | To use the AmazonCloudWatch as the client | null | false | MEDIUM
-| *camel.sink.endpoint.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.sink.endpoint.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then cre [...]
 | *camel.sink.endpoint.name* | The metric name | null | false | MEDIUM
 | *camel.sink.endpoint.proxyHost* | To define a proxy host when instantiating the CW client | null | false | MEDIUM
@@ -42,12 +41,10 @@ The camel-aws2-cw sink connector supports 33 options, which are listed below.
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.sink.endpoint.unit* | The metric unit | null | false | MEDIUM
 | *camel.sink.endpoint.value* | The metric value | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-cw.amazonCwClient* | To use the AmazonCloudWatch as the client | null | false | MEDIUM
-| *camel.component.aws2-cw.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws2-cw.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-cw.lazyStartProducer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then [...]
 | *camel.component.aws2-cw.name* | The metric name | null | false | MEDIUM
@@ -59,7 +56,7 @@ The camel-aws2-cw sink connector supports 33 options, which are listed below.
 | *camel.component.aws2-cw.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.component.aws2-cw.unit* | The metric unit | null | false | MEDIUM
 | *camel.component.aws2-cw.value* | The metric value | null | false | MEDIUM
-| *camel.component.aws2-cw.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws2-cw.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-cw.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-cw.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws2-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2cw/CamelAws2cwSinkConnectorConfig.java b/connectors/camel-aws2-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2cw/CamelAws2cwSinkConnectorConfig.java
index 97473ba..78e252e 100644
--- a/connectors/camel-aws2-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2cw/CamelAws2cwSinkConnectorConfig.java
+++ b/connectors/camel-aws2-cw-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2cw/CamelAws2cwSinkConnectorConfig.java
@@ -30,9 +30,6 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_CONF = "camel.sink.endpoint.amazonCwClient";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_DOC = "To use the AmazonCloudWatch as the client";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC = "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.";
-    public static final Boolean CAMEL_SINK_AWS2CW_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_CONF = "camel.sink.endpoint.lazyStartProducer";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_DOC = "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that whe [...]
     public static final Boolean CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_DEFAULT = false;
@@ -63,9 +60,6 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_CONF = "camel.sink.endpoint.value";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_DOC = "The metric value";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWS2CW_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWS2CW_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWS2CW_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWS2CW_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -78,9 +72,6 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_AMAZON_CW_CLIENT_CONF = "camel.component.aws2-cw.amazonCwClient";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_AMAZON_CW_CLIENT_DOC = "To use the AmazonCloudWatch as the client";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_AMAZON_CW_CLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2CW_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws2-cw.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWS2CW_COMPONENT_AUTO_DISCOVER_CLIENT_DOC = "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.";
-    public static final Boolean CAMEL_SINK_AWS2CW_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-cw.configuration";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_DOC = "The component configuration";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -114,9 +105,9 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_VALUE_CONF = "camel.component.aws2-cw.value";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_VALUE_DOC = "The metric value";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_VALUE_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2CW_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws2-cw.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWS2CW_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWS2CW_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-cw.autowiredEnabled";
+    public static final String CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws2-cw.accessKey";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -138,7 +129,6 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWS2CW_PATH_NAMESPACE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_PATH_NAMESPACE_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2CW_PATH_NAMESPACE_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_AMAZON_CW_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_NAME_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_PROXY_HOST_DOC);
@@ -149,12 +139,10 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_UNIT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_VALUE_DOC);
-        conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2CW_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_AMAZON_CW_CLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_AMAZON_CW_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_AMAZON_CW_CLIENT_DOC);
-        conf.define(CAMEL_SINK_AWS2CW_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_LAZY_START_PRODUCER_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_LAZY_START_PRODUCER_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_LAZY_START_PRODUCER_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_NAME_DOC);
@@ -166,7 +154,7 @@ public class CamelAws2cwSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_UNIT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_UNIT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_UNIT_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_VALUE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_VALUE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_VALUE_DOC);
-        conf.define(CAMEL_SINK_AWS2CW_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWS2CW_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2CW_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2CW_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2CW_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-sink.json b/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-sink.json
index 062950f..237b751 100644
--- a/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-sink.json
+++ b/connectors/camel-aws2-ddb-kafka-connector/src/generated/resources/camel-aws2-ddb-sink.json
@@ -21,13 +21,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.autoDiscoverClient": {
-			"name": "camel.sink.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.consistentRead": {
 			"name": "camel.sink.endpoint.consistentRead",
 			"description": "Determines whether or not strong consistency should be enforced when data is read.",
@@ -105,13 +98,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.sink.endpoint.basicPropertyBinding": {
-			"name": "camel.sink.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.sink.endpoint.synchronous": {
 			"name": "camel.sink.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -137,13 +123,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddb.autoDiscoverClient": {
-			"name": "camel.component.aws2-ddb.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ddb.configuration": {
 			"name": "camel.component.aws2-ddb.configuration",
 			"description": "The component configuration",
@@ -227,11 +206,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddb.basicPropertyBinding": {
-			"name": "camel.component.aws2-ddb.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ddb.autowiredEnabled": {
+			"name": "camel.component.aws2-ddb.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-ddb.accessKey": {
diff --git a/connectors/camel-aws2-ddb-kafka-connector/src/main/docs/camel-aws2-ddb-kafka-sink-connector.adoc b/connectors/camel-aws2-ddb-kafka-connector/src/main/docs/camel-aws2-ddb-kafka-sink-connector.adoc
index b83ad14..36635c0 100644
--- a/connectors/camel-aws2-ddb-kafka-connector/src/main/docs/camel-aws2-ddb-kafka-sink-connector.adoc
+++ b/connectors/camel-aws2-ddb-kafka-connector/src/main/docs/camel-aws2-ddb-kafka-sink-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ddb.CamelAws2ddbSinkConnecto
 ----
 
 
-The camel-aws2-ddb sink connector supports 37 options, which are listed below.
+The camel-aws2-ddb sink connector supports 34 options, which are listed below.
 
 
 
@@ -31,7 +31,6 @@ The camel-aws2-ddb sink connector supports 37 options, which are listed below.
 | Name | Description | Default | Required | Priority
 | *camel.sink.path.tableName* | The name of the table currently worked with. | null | true | HIGH
 | *camel.sink.endpoint.amazonDDBClient* | To use the AmazonDynamoDB as the client | null | false | MEDIUM
-| *camel.sink.endpoint.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.sink.endpoint.consistentRead* | Determines whether or not strong consistency should be enforced when data is read. | false | false | MEDIUM
 | *camel.sink.endpoint.keyAttributeName* | Attribute name when creating table | null | false | MEDIUM
 | *camel.sink.endpoint.keyAttributeType* | Attribute type when creating table | null | false | MEDIUM
@@ -44,12 +43,10 @@ The camel-aws2-ddb sink connector supports 37 options, which are listed below.
 | *camel.sink.endpoint.region* | The region in which DDB client needs to work | null | false | MEDIUM
 | *camel.sink.endpoint.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.sink.endpoint.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
-| *camel.sink.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.sink.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.sink.endpoint.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.sink.endpoint.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 | *camel.component.aws2-ddb.amazonDDBClient* | To use the AmazonDynamoDB as the client | null | false | MEDIUM
-| *camel.component.aws2-ddb.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking. | true | false | MEDIUM
 | *camel.component.aws2-ddb.configuration* | The component configuration | null | false | MEDIUM
 | *camel.component.aws2-ddb.consistentRead* | Determines whether or not strong consistency should be enforced when data is read. | false | false | MEDIUM
 | *camel.component.aws2-ddb.keyAttributeName* | Attribute name when creating table | null | false | MEDIUM
@@ -63,7 +60,7 @@ The camel-aws2-ddb sink connector supports 37 options, which are listed below.
 | *camel.component.aws2-ddb.region* | The region in which DDB client needs to work | null | false | MEDIUM
 | *camel.component.aws2-ddb.trustAllCertificates* | If we want to trust all certificates in case of overriding the endpoint | false | false | MEDIUM
 | *camel.component.aws2-ddb.writeCapacity* | The provisioned throughput to reserved for writing resources to your table | null | false | MEDIUM
-| *camel.component.aws2-ddb.basicPropertyBinding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | LOW
+| *camel.component.aws2-ddb.autowiredEnabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | false | MEDIUM
 | *camel.component.aws2-ddb.accessKey* | Amazon AWS Access Key | null | false | MEDIUM
 | *camel.component.aws2-ddb.secretKey* | Amazon AWS Secret Key | null | false | MEDIUM
 |===
diff --git a/connectors/camel-aws2-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddb/CamelAws2ddbSinkConnectorConfig.java b/connectors/camel-aws2-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddb/CamelAws2ddbSinkConnectorConfig.java
index 8ff9e6c..3ebe694 100644
--- a/connectors/camel-aws2-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddb/CamelAws2ddbSinkConnectorConfig.java
+++ b/connectors/camel-aws2-ddb-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2ddb/CamelAws2ddbSinkConnectorConfig.java
@@ -30,9 +30,6 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_AMAZON_DDBCLIENT_CONF = "camel.sink.endpoint.amazonDDBClient";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_AMAZON_DDBCLIENT_DOC = "To use the AmazonDynamoDB as the client";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_AMAZON_DDBCLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF = "camel.sink.endpoint.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC = "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.";
-    public static final Boolean CAMEL_SINK_AWS2DDB_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_CONSISTENT_READ_CONF = "camel.sink.endpoint.consistentRead";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_CONSISTENT_READ_DOC = "Determines whether or not strong consistency should be enforced when data is read.";
     public static final Boolean CAMEL_SINK_AWS2DDB_ENDPOINT_CONSISTENT_READ_DEFAULT = false;
@@ -69,9 +66,6 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_CONF = "camel.sink.endpoint.writeCapacity";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_DOC = "The provisioned throughput to reserved for writing resources to your table";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF = "camel.sink.endpoint.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWS2DDB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT = false;
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_SYNCHRONOUS_CONF = "camel.sink.endpoint.synchronous";
     public static final String CAMEL_SINK_AWS2DDB_ENDPOINT_SYNCHRONOUS_DOC = "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).";
     public static final Boolean CAMEL_SINK_AWS2DDB_ENDPOINT_SYNCHRONOUS_DEFAULT = false;
@@ -84,9 +78,6 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AMAZON_DDBCLIENT_CONF = "camel.component.aws2-ddb.amazonDDBClient";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AMAZON_DDBCLIENT_DOC = "To use the AmazonDynamoDB as the client";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AMAZON_DDBCLIENT_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AUTO_DISCOVER_CLIENT_CONF = "camel.component.aws2-ddb.autoDiscoverClient";
-    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AUTO_DISCOVER_CLIENT_DOC = "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.";
-    public static final Boolean CAMEL_SINK_AWS2DDB_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_CONFIGURATION_CONF = "camel.component.aws2-ddb.configuration";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_CONFIGURATION_DOC = "The component configuration";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_CONFIGURATION_DEFAULT = null;
@@ -126,9 +117,9 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_CONF = "camel.component.aws2-ddb.writeCapacity";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_DOC = "The provisioned throughput to reserved for writing resources to your table";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_DEFAULT = null;
-    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_BASIC_PROPERTY_BINDING_CONF = "camel.component.aws2-ddb.basicPropertyBinding";
-    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_BASIC_PROPERTY_BINDING_DOC = "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities";
-    public static final Boolean CAMEL_SINK_AWS2DDB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT = false;
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_CONF = "camel.component.aws2-ddb.autowiredEnabled";
+    public static final String CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_DOC = "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.";
+    public static final Boolean CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT = true;
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_CONF = "camel.component.aws2-ddb.accessKey";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_DOC = "Amazon AWS Access Key";
     public static final String CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_DEFAULT = null;
@@ -150,7 +141,6 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         ConfigDef conf = new ConfigDef(CamelSinkConnectorConfig.conf());
         conf.define(CAMEL_SINK_AWS2DDB_PATH_TABLE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_PATH_TABLE_NAME_DEFAULT, ConfigDef.Importance.HIGH, CAMEL_SINK_AWS2DDB_PATH_TABLE_NAME_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_AMAZON_DDBCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_AMAZON_DDBCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_AMAZON_DDBCLIENT_DOC);
-        conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_CONSISTENT_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_CONSISTENT_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_CONSISTENT_READ_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_NAME_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_KEY_ATTRIBUTE_TYPE_DOC);
@@ -163,12 +153,10 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_WRITE_CAPACITY_DOC);
-        conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_BASIC_PROPERTY_BINDING_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_SYNCHRONOUS_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_ENDPOINT_SYNCHRONOUS_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_SYNCHRONOUS_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_ENDPOINT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_ENDPOINT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_ENDPOINT_SECRET_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_AMAZON_DDBCLIENT_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_AMAZON_DDBCLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_AMAZON_DDBCLIENT_DOC);
-        conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_AUTO_DISCOVER_CLIENT_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_AUTO_DISCOVER_CLIENT_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_AUTO_DISCOVER_CLIENT_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_CONFIGURATION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_CONFIGURATION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_CONFIGURATION_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_CONSISTENT_READ_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_CONSISTENT_READ_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_CONSISTENT_READ_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_KEY_ATTRIBUTE_NAME_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_KEY_ATTRIBUTE_NAME_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_KEY_ATTRIBUTE_NAME_DOC);
@@ -182,7 +170,7 @@ public class CamelAws2ddbSinkConnectorConfig extends CamelSinkConnectorConfig {
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_REGION_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_REGION_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_REGION_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_TRUST_ALL_CERTIFICATES_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_WRITE_CAPACITY_DOC);
-        conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_BASIC_PROPERTY_BINDING_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_BASIC_PROPERTY_BINDING_DEFAULT, ConfigDef.Importance.LOW, CAMEL_SINK_AWS2DDB_COMPONENT_BASIC_PROPERTY_BINDING_DOC);
+        conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_CONF, ConfigDef.Type.BOOLEAN, CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_AUTOWIRED_ENABLED_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_ACCESS_KEY_DOC);
         conf.define(CAMEL_SINK_AWS2DDB_COMPONENT_SECRET_KEY_CONF, ConfigDef.Type.STRING, CAMEL_SINK_AWS2DDB_COMPONENT_SECRET_KEY_DEFAULT, ConfigDef.Importance.MEDIUM, CAMEL_SINK_AWS2DDB_COMPONENT_SECRET_KEY_DOC);
         return conf;
diff --git a/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-source.json b/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-source.json
index fcf834d..3a6f737 100644
--- a/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-source.json
+++ b/connectors/camel-aws2-ddbstream-kafka-connector/src/generated/resources/camel-aws2-ddbstream-source.json
@@ -15,13 +15,6 @@
 			"priority": "HIGH",
 			"required": "true"
 		},
-		"camel.source.endpoint.autoDiscoverClient": {
-			"name": "camel.source.endpoint.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.amazonDynamoDbStreamsClient": {
 			"name": "camel.source.endpoint.amazonDynamoDbStreamsClient",
 			"description": "Amazon DynamoDB client to use for all requests for this endpoint",
@@ -111,13 +104,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.source.endpoint.basicPropertyBinding": {
-			"name": "camel.source.endpoint.basicPropertyBinding",
-			"description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.source.endpoint.synchronous": {
 			"name": "camel.source.endpoint.synchronous",
 			"description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
@@ -230,13 +216,6 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.autoDiscoverClient": {
-			"name": "camel.component.aws2-ddbstream.autoDiscoverClient",
-			"description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-			"defaultValue": "true",
-			"priority": "MEDIUM",
-			"required": "false"
-		},
 		"camel.component.aws2-ddbstream.amazonDynamoDbStreamsClient": {
 			"name": "camel.component.aws2-ddbstream.amazonDynamoDbStreamsClient",
 			"description": "Amazon DynamoDB client to use for all requests for this endpoint",
@@ -307,11 +286,11 @@
 			"priority": "MEDIUM",
 			"required": "false"
 		},
-		"camel.component.aws2-ddbstream.basicPropertyBinding": {
-			"name": "camel.component.aws2-ddbstream.basicPropertyBinding",
-			"description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-			"defaultValue": "false",
-			"priority": "LOW",
+		"camel.component.aws2-ddbstream.autowiredEnabled": {
+			"name": "camel.component.aws2-ddbstream.autowiredEnabled",
+			"description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
+			"defaultValue": "true",
+			"priority": "MEDIUM",
 			"required": "false"
 		},
 		"camel.component.aws2-ddbstream.accessKey": {
diff --git a/connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc b/connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc
index f8a7c0b..8282663 100644
--- a/connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc
+++ b/connectors/camel-aws2-ddbstream-kafka-connector/src/main/docs/camel-aws2-ddbstream-kafka-source-connector.adoc
@@ -22,7 +22,7 @@ connector.class=org.apache.camel.kafkaconnector.aws2ddbstream.CamelAws2ddbstream
 ----
 
 
-The camel-aws2-ddbstream source connector supports 49 options, which are listed below.
+The camel-aws2-ddbstream source connector supports 46 options, which are listed below.
 
 
 
@@ -30,7 +30,6 @@ The camel-aws2-ddbstream source connector supports 49 options, which are listed
 |===
 | Name | Description | Default | Required | Priority
 | *camel.source.path.tableName* | Name of the dynamodb table | null | true | HIGH
-| *camel.source.endpoint.autoDiscoverClient* | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | false | MEDIUM
 | *camel.source.endpoint.amazonDynamoDbStreamsClient* | Amazon DynamoDB client to use for all requests for this endpoint | null | false | MEDIUM
 | *camel.source.endpoint.bridgeErrorHandler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | false | MEDIUM
 | *camel.source.endpoint.iteratorType* | Defines where in the DynaboDB stream to start getting records. Note that using TRIM_HORIZON can cause a significant delay before the stream has caught up to real-time. if {AT,AFTER}_SEQUENCE_NUMBER are used, then a sequenceNumberProvider MUST be supplied. One of: [TRIM_HORIZON] [LATEST] [AT_SEQUENCE_NUMBER] [AFTER_SEQUENCE_NUMBER] [null] | "LATEST" | false | MEDIUM
@@ -45,7 +44,6 @@ The camel-aws2-ddbstream source connector supports 49 options, which are listed
 | *camel.source.endpoint.exceptionHandler* | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | null | false | MEDIUM
 | *camel.source.endpoint.exchangePattern* | Sets the exchange pattern when the consumer creates an exchange. One of: [InOnly] [InOut] [InOptionalOut] | null | false | MEDIUM
 | *camel.source.endpoint.pollStrategy* | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | null | false | MEDIUM
-| *camel.source.endpoint.basicPropertyBinding* | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | false | MEDIUM
 | *camel.source.endpoint.synchronous* | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | false | MEDIUM
 | *camel.source.endpoint.backoffErrorThreshold* | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | null | false | MEDIUM
... 66887 lines suppressed ...